From ae02415ee82b0f34cbcabf639335210e5b58a71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 29 Apr 2021 07:21:13 +0200 Subject: [PATCH 01/37] treewide: remove gnidorah due to github account removal/deletion and not other mean of contact. --- maintainers/maintainer-list.nix | 6 ------ nixos/modules/programs/sway.nix | 2 +- nixos/modules/services/audio/jack.nix | 2 +- nixos/modules/services/misc/autorandr.nix | 2 +- nixos/modules/services/misc/fstrim.nix | 2 +- nixos/modules/services/misc/gitweb.nix | 2 +- nixos/modules/services/misc/mame.nix | 2 +- nixos/modules/services/networking/hans.nix | 2 +- nixos/modules/services/web-servers/nginx/gitweb.nix | 2 +- nixos/modules/services/x11/desktop-managers/cde.nix | 2 +- nixos/modules/virtualisation/kvmgt.nix | 2 +- pkgs/applications/audio/adlplug/default.nix | 2 +- pkgs/applications/audio/midisheetmusic/default.nix | 2 +- pkgs/applications/audio/munt/default.nix | 2 +- pkgs/applications/audio/openmpt123/default.nix | 2 +- pkgs/applications/audio/uade123/default.nix | 4 ++-- pkgs/applications/graphics/lazpaint/default.nix | 2 +- pkgs/applications/misc/ArchiSteamFarm/default.nix | 2 +- pkgs/applications/misc/cpu-x/default.nix | 2 +- pkgs/applications/misc/qdirstat/default.nix | 2 +- .../networking/instant-messengers/rambox/default.nix | 2 +- .../networking/instant-messengers/vk-messenger/default.nix | 2 +- pkgs/applications/office/mytetra/default.nix | 2 +- .../version-management/git-and-tools/gitweb/default.nix | 2 +- pkgs/data/themes/cdetheme/default.nix | 2 +- pkgs/data/themes/kde2/default.nix | 2 +- pkgs/data/themes/qtcurve/default.nix | 2 +- pkgs/desktops/cdesktopenv/default.nix | 2 +- pkgs/development/compilers/pakcs/default.nix | 2 +- pkgs/development/libraries/gtk-engine-bluecurve/default.nix | 2 +- pkgs/development/libraries/hotpatch/default.nix | 2 +- pkgs/development/libraries/kmsxx/default.nix | 2 +- pkgs/development/libraries/qtstyleplugins/default.nix | 2 +- pkgs/development/python-modules/midiutil/default.nix | 2 +- pkgs/development/python-modules/pydbus/default.nix | 2 +- pkgs/development/python-modules/pysmf/default.nix | 2 +- .../python-modules/python-fontconfig/default.nix | 2 +- pkgs/games/iortcw/sp.nix | 2 +- pkgs/games/openjk/default.nix | 2 +- pkgs/games/openmw/tes3mp.nix | 2 +- pkgs/games/openxray/default.nix | 2 +- pkgs/games/quakespasm/vulkan.nix | 2 +- pkgs/misc/emulators/mame/default.nix | 2 +- pkgs/servers/nas/default.nix | 2 +- pkgs/tools/audio/mididings/default.nix | 2 +- pkgs/tools/audio/opl3bankeditor/default.nix | 2 +- pkgs/tools/audio/video2midi/default.nix | 2 +- pkgs/tools/graphics/twilight/default.nix | 2 +- pkgs/tools/misc/me_cleaner/default.nix | 2 +- pkgs/tools/misc/woeusb/default.nix | 2 +- pkgs/tools/networking/phodav/default.nix | 2 +- pkgs/tools/system/ps_mem/default.nix | 2 +- 52 files changed, 52 insertions(+), 58 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 91e8c9591fb..df9a78d0234 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3675,12 +3675,6 @@ githubId = 1447245; name = "Robin Gloster"; }; - gnidorah = { - email = "gnidorah@users.noreply.github.com"; - github = "gnidorah"; - githubId = 12064730; - name = "gnidorah"; - }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix index 107e783c0c2..17e513909ae 100644 --- a/nixos/modules/programs/sway.nix +++ b/nixos/modules/programs/sway.nix @@ -133,5 +133,5 @@ in { programs.xwayland.enable = mkDefault true; }; - meta.maintainers = with lib.maintainers; [ gnidorah primeos colemickens ]; + meta.maintainers = with lib.maintainers; [ primeos colemickens ]; } diff --git a/nixos/modules/services/audio/jack.nix b/nixos/modules/services/audio/jack.nix index bee97dbfc6b..f341b432f75 100644 --- a/nixos/modules/services/audio/jack.nix +++ b/nixos/modules/services/audio/jack.nix @@ -290,5 +290,5 @@ in { ]; - meta.maintainers = [ maintainers.gnidorah ]; + meta.maintainers = [ ]; } diff --git a/nixos/modules/services/misc/autorandr.nix b/nixos/modules/services/misc/autorandr.nix index dfb418af6ed..95cee5046e8 100644 --- a/nixos/modules/services/misc/autorandr.nix +++ b/nixos/modules/services/misc/autorandr.nix @@ -48,5 +48,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/misc/fstrim.nix b/nixos/modules/services/misc/fstrim.nix index 5258f5acb41..a9fc04b46f0 100644 --- a/nixos/modules/services/misc/fstrim.nix +++ b/nixos/modules/services/misc/fstrim.nix @@ -42,5 +42,5 @@ in { }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index ca21366b779..13396bf2eb0 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -54,6 +54,6 @@ in }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/misc/mame.nix b/nixos/modules/services/misc/mame.nix index 34a471ea4fe..4b9a04be7c2 100644 --- a/nixos/modules/services/misc/mame.nix +++ b/nixos/modules/services/misc/mame.nix @@ -63,5 +63,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ gnidorah ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix index 8334dc68d62..84147db00f6 100644 --- a/nixos/modules/services/networking/hans.nix +++ b/nixos/modules/services/networking/hans.nix @@ -141,5 +141,5 @@ in }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix index f7fb07bb797..11bf2a309ea 100644 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -89,6 +89,6 @@ in }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 2d9504fb5f1..3f1575a0ca6 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -68,5 +68,5 @@ in { }]; }; - meta.maintainers = [ maintainers.gnidorah ]; + meta.maintainers = [ ]; } diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index e08ad344628..72bd2c24e56 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -82,5 +82,5 @@ in { }; }; - meta.maintainers = with maintainers; [ gnidorah ]; + meta.maintainers = with maintainers; [ ]; } diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index ecc429de6b2..8d396d7f2a3 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.boost; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index bff9e807b43..6a5626d98a6 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { description = "Convert MIDI Files to Piano Sheet Music for two hands"; homepage = "http://midisheetmusic.com"; license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/munt/default.nix b/pkgs/applications/audio/munt/default.nix index 0efe034034a..da8dcb0b0c1 100644 --- a/pkgs/applications/audio/munt/default.nix +++ b/pkgs/applications/audio/munt/default.nix @@ -33,6 +33,6 @@ in mkDerivation rec { homepage = "http://munt.sourceforge.net/"; license = with licenses; [ lgpl21 gpl3 ]; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 7f412d528db..67b7bd241f3 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { description = "A cross-platform command-line based module file player"; homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 368731c52b3..271f9f912ea 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; - maintainers = [ lib.maintainers.gnidorah ]; - platforms = lib.platforms.unix; + maintainers = [ ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/graphics/lazpaint/default.nix b/pkgs/applications/graphics/lazpaint/default.nix index 4dae4dd3f9a..82eab9757c7 100644 --- a/pkgs/applications/graphics/lazpaint/default.nix +++ b/pkgs/applications/graphics/lazpaint/default.nix @@ -63,6 +63,6 @@ in stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/lazpaint/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index c753721adbf..cc6b1eab5de 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = licenses.asl20; platforms = dotnetCorePackages.aspnetcore_3_1.meta.platforms; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; hydraPlatforms = []; }; } diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index 2de06f8c031..8f68a512c21 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index bba78bf7538..d5450f0e5c4 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -51,7 +51,7 @@ mkDerivation { description = "Graphical disk usage analyzer"; homepage = src.meta.homepage; license = licenses.gpl2Plus; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 5525805c2e4..cbec6babec3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -21,7 +21,7 @@ in mkRambox rec { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; homepage = "https://rambox.pro"; license = licenses.mit; - maintainers = with maintainers; [ gnidorah ma27 ]; + maintainers = with maintainers; [ ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; hydraPlatforms = []; }; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 27312a18ec4..96ae3993b38 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -25,7 +25,7 @@ let description = "Simple and Convenient Messaging App for VK"; homepage = "https://vk.com/messenger"; license = licenses.unfree; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"]; }; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 3e2383fb356..cb90af5244c 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -33,7 +33,7 @@ in mkDerivation { description = "Smart manager for information collecting"; homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix index 1fa2ebc6f74..478d9aaf0cc 100644 --- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix @@ -22,6 +22,6 @@ in buildEnv { ++ [ "${git}/share/gitweb" ]; meta = git.meta // { - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/data/themes/cdetheme/default.nix b/pkgs/data/themes/cdetheme/default.nix index 466f7d0daf1..a2d6568b9a8 100644 --- a/pkgs/data/themes/cdetheme/default.nix +++ b/pkgs/data/themes/cdetheme/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.gnome-look.org/p/1231025"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; hydraPlatforms = []; }; } diff --git a/pkgs/data/themes/kde2/default.nix b/pkgs/data/themes/kde2/default.nix index 04986b7dcc5..1404a6ca86e 100644 --- a/pkgs/data/themes/kde2/default.nix +++ b/pkgs/data/themes/kde2/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { homepage = "https://github.com/repos-holder/kdecoration2-kde2"; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index 45a56f3355e..0b639133a4a 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -64,6 +64,6 @@ mkDerivation rec { description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; license = licenses.lgpl21Plus; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 2a0769c92e9..563a1b49e51 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -75,7 +75,7 @@ EOF description = "Common Desktop Environment"; homepage = "https://sourceforge.net/projects/cdesktopenv/"; license = licenses.lgpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 98fab9eb210..e2dceaab397 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation { with dynamic web pages, prototyping embedded systems). ''; - maintainers = with maintainers; [ kkallio gnidorah ]; + maintainers = with maintainers; [ kkallio ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix index 84920060c5e..918e1679eba 100644 --- a/pkgs/development/libraries/gtk-engine-bluecurve/default.nix +++ b/pkgs/development/libraries/gtk-engine-bluecurve/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { description = "Original Bluecurve engine from Red Hat's artwork package"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/hotpatch/default.nix b/pkgs/development/libraries/hotpatch/default.nix index 9857f9f281c..2dd894ff4a3 100644 --- a/pkgs/development/libraries/hotpatch/default.nix +++ b/pkgs/development/libraries/hotpatch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Hot patching executables on Linux using .so file injection"; homepage = src.meta.homepage; license = licenses.bsd3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = ["i686-linux" "x86_64-linux"]; }; } diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index c88dde7e445..222747b4d73 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; broken = true; # marked broken 2021-03-26 }; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 85468bd4f18..ebc7bc08193 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -31,7 +31,7 @@ mkDerivation { description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique"; homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/"; license = licenses.lgpl21; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/midiutil/default.nix b/pkgs/development/python-modules/midiutil/default.nix index d1cae8c7804..a3527bc6e1c 100644 --- a/pkgs/development/python-modules/midiutil/default.nix +++ b/pkgs/development/python-modules/midiutil/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { homepage = "https://github.com/MarkCWirt/MIDIUtil"; description = "A pure python library for creating multi-track MIDI files"; license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 09f777b0181..aa3a41e2f8c 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pysmf/default.nix b/pkgs/development/python-modules/pysmf/default.nix index 25f5fc6a20c..2bbcc95fc8c 100644 --- a/pkgs/development/python-modules/pysmf/default.nix +++ b/pkgs/development/python-modules/pysmf/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { homepage = "http://das.nasophon.de/pysmf/"; description = "Python extension module for reading and writing Standard MIDI Files, based on libsmf."; license = licenses.bsd2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 88778ff794e..4aabb208a90 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -29,6 +29,6 @@ in buildPythonPackage rec { homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ gnidorah ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/games/iortcw/sp.nix index fc1976b0fb1..fa6f73a177b 100644 --- a/pkgs/games/iortcw/sp.nix +++ b/pkgs/games/iortcw/sp.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index ecb2cd3c46c..c16b38fc8f1 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation { homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 95659e5a088..863f818ed42 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -91,6 +91,6 @@ in openmw.overrideAttrs (oldAttrs: rec { homepage = "https://tes3mp.com/"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 8fe47d31ca7..e4a742d821c 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { license = licenses.unfree // { url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; }; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix index 3565ce10ba1..0d0b03f514b 100644 --- a/pkgs/games/quakespasm/vulkan.nix +++ b/pkgs/games/quakespasm/vulkan.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index b50181a4d98..e803a130683 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -82,6 +82,6 @@ in mkDerivation { platforms = platforms.unix; # makefile needs fixes for install target badPlatforms = [ "aarch64-linux" ]; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 319bee115c2..4732368ac88 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { description = "A network transparent, client/server audio transport system"; homepage = "http://radscan.com/nas.html"; license = licenses.mit; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/mididings/default.nix b/pkgs/tools/audio/mididings/default.nix index d5f78ada91c..186f67f3504 100644 --- a/pkgs/tools/audio/mididings/default.nix +++ b/pkgs/tools/audio/mididings/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { description = "A MIDI router and processor based on Python, supporting ALSA and JACK MIDI"; homepage = "http://das.nasophon.de/mididings"; license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 48f553d960d..0c82d09f99b 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -22,6 +22,6 @@ mkDerivation rec { homepage = src.meta.homepage; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/audio/video2midi/default.nix b/pkgs/tools/audio/video2midi/default.nix index 4eafd7f52e1..e8f5af70c87 100644 --- a/pkgs/tools/audio/video2midi/default.nix +++ b/pkgs/tools/audio/video2midi/default.nix @@ -29,7 +29,7 @@ in pythonPackages.buildPythonApplication rec { description = "Youtube synthesia video to midi conversion tool"; homepage = src.meta.homepage; license = licenses.gpl3; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 2716c5e7c65..7c43063fb81 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -25,6 +25,6 @@ in stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/me_cleaner/default.nix b/pkgs/tools/misc/me_cleaner/default.nix index 5335624467d..308b69c9d74 100644 --- a/pkgs/tools/misc/me_cleaner/default.nix +++ b/pkgs/tools/misc/me_cleaner/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { with the final purpose of reducing its ability to interact with the system. ''; license = licenses.gpl3; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 8cbd1ad0697..a728afc388a 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { description = "Create bootable USB disks from Windows ISO images"; homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; - maintainers = with maintainers; [ bjornfor gnidorah ]; + maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index dfaad9c1e97..9b1c3d005b9 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; - maintainers = with maintainers; [ gnidorah ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 152bb1150e5..1752aba240f 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication { description = "A utility to accurately report the in core memory usage for a program"; homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; - maintainers = [ maintainers.gnidorah ]; + maintainers = [ ]; platforms = platforms.linux; }; } From 08ab1d9572735f9a1218ffaa1ade0ac3e9b60167 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 30 Apr 2021 11:31:48 +0200 Subject: [PATCH 02/37] doc/contributing: add unnecessary string conversions --- doc/contributing/coding-conventions.chapter.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/doc/contributing/coding-conventions.chapter.md b/doc/contributing/coding-conventions.chapter.md index eccf4f7436e..c29b40c298e 100644 --- a/doc/contributing/coding-conventions.chapter.md +++ b/doc/contributing/coding-conventions.chapter.md @@ -169,6 +169,18 @@ }) ``` +- Unnecessary string conversions should be avoided. Do + + ```nix + rev = version; + ``` + + instead of + + ```nix + rev = "${version}"; + ``` + - Arguments should be listed in the order they are used, with the exception of `lib`, which always goes first. - Prefer using the top-level `lib` over its alias `stdenv.lib`. `lib` is unrelated to `stdenv`, and so `stdenv.lib` should only be used as a convenience alias when developing to avoid having to modify the function inputs just to test something out. From 7242fa1cb6ec8e165966dbe47ef06d8fbd049836 Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Thu, 6 May 2021 20:23:51 +0200 Subject: [PATCH 03/37] matrix-appservice-slack: 1.7.0 -> 1.8.0 --- .../matrix-appservice-slack/default.nix | 4 +- .../generate-dependencies.sh | 6 +- .../matrix-appservice-slack/node-packages.nix | 1154 ++++++++--------- 3 files changed, 562 insertions(+), 602 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/default.nix index 62a73246154..9d21065dc02 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.7.0"; - sha256 = "sha256-0BcnG/DGvc3uh/eP0KIB5gPSpXNPlaAl78D4bVCnLHg="; + rev = "1.8.0"; + sha256 = "sha256-FA6SMivMnloeZmnUhGx6N+ZLDTZFO3y17xJYclkp5w0="; }; 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 6e622bdd75f..9fab4889170 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.7.0 release -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package.json -o package.json -curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.7.0/package-lock.json -o package-lock.json +# Download package.json and package-lock.json from the v1.8.0 release +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.0/package.json -o package.json +curl https://raw.githubusercontent.com/matrix-org/matrix-appservice-slack/1.8.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 90e9d67f9d8..bc5bc8cf1c7 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; }; }; - "@babel/highlight-7.10.4" = { + "@babel/highlight-7.13.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.10.4"; + version = "7.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz"; - sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz"; + sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; }; }; - "@babel/runtime-7.12.13" = { + "@babel/runtime-7.13.10" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.13"; + version = "7.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.13.tgz"; - sha512 = "8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"; + sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw=="; }; }; "@dabh/diagnostics-2.0.2" = { @@ -49,13 +49,13 @@ let sha512 = "+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q=="; }; }; - "@eslint/eslintrc-0.2.2" = { + "@eslint/eslintrc-0.4.0" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "0.2.2"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.2.tgz"; - sha512 = "EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.0.tgz"; + sha512 = "2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -130,13 +130,13 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/chai-4.2.14" = { + "@types/chai-4.2.16" = { name = "_at_types_slash_chai"; packageName = "@types/chai"; - version = "4.2.14"; + version = "4.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.14.tgz"; - sha512 = "G+ITQPXkwTrslfG5L/BksmbLUA0M1iybEsmCWPqzSxsRRhJZimBKJkoMi8fr/CPygPTj4zO5pJH7I2/cm9M7SQ=="; + url = "https://registry.npmjs.org/@types/chai/-/chai-4.2.16.tgz"; + sha512 = "vI5iOAsez9+roLS3M3+Xx7w+WRuDtSmF8bQkrbcIJ2sC1PcDgVoA0WGpa+bIrJ+y8zqY2oi//fUctkxtIcXJCw=="; }; }; "@types/connect-3.4.34" = { @@ -148,22 +148,22 @@ let sha512 = "ePPA/JuI+X0vb+gSWlPKOY0NdNAie/rPUqX2GUPpbZwiKTkSPhjXWuee47E4MtE54QVzGCQMQkAL6JhV2E1+cQ=="; }; }; - "@types/express-4.17.10" = { + "@types/express-4.17.11" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.10"; + version = "4.17.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.10.tgz"; - sha512 = "GRwKdE+iV6mA8glCvQ7W5iaoIhd6u1HDsNTF76UPRi7T89SLjOfeCLShVmQSgpXzcpf3zgcz2SbMiCcjnYRRxQ=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.11.tgz"; + sha512 = "no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg=="; }; }; - "@types/express-serve-static-core-4.17.18" = { + "@types/express-serve-static-core-4.17.19" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.18"; + version = "4.17.19"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz"; - sha512 = "m4JTwx5RUBNZvky/JJ8swEJPKFd8si08pPF2PfizYjGZOKr/svUWPcoUmLow6MmPzhasphB7gSTINY67xn3JNA=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz"; + sha512 = "DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA=="; }; }; "@types/is-stream-1.1.0" = { @@ -175,31 +175,40 @@ let sha512 = "jkZatu4QVbR60mpIzjINmtS1ZF4a/FqdTUTBeQDVOQ2PYyidtwFKr0B5G6ERukKwliq+7mIXvxyppwzG5EgRYg=="; }; }; - "@types/json-schema-7.0.6" = { + "@types/js-yaml-4.0.0" = { + name = "_at_types_slash_js-yaml"; + packageName = "@types/js-yaml"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.0.tgz"; + sha512 = "4vlpCM5KPCL5CfGmTbpjwVKbISRYhduEJvvUWsH5EB7QInhEj94XPZ3ts/9FPiLZFqYO0xoW4ZL8z2AabTGgJA=="; + }; + }; + "@types/json-schema-7.0.7" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.6"; + version = "7.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz"; - sha512 = "3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz"; + sha512 = "cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA=="; }; }; - "@types/mime-2.0.3" = { + "@types/mime-1.3.2" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "2.0.3"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-2.0.3.tgz"; - sha512 = "Jus9s4CDbqwocc5pOAnh8ShfrnMcPHuJYzVcSUU7lrh8Ni5HuIqX3oilL86p3dlTrk0LzHRCgA/GQ7uNCw6l2Q=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; + sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; }; }; - "@types/mocha-8.2.0" = { + "@types/mocha-8.2.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "8.2.0"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.0.tgz"; - sha512 = "/Sge3BymXo4lKc31C8OINJgXLaw+7vL1/L1pGiBNpGrBiT8FQiaFpSYV0uhTaG4y78vcMBTMFsWaHDvuD+xGzQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-8.2.2.tgz"; + sha512 = "Lwh0lzzqT5Pqh6z61P3c3P5nm6fzQK/MMHl9UKeneAeInVflBSz1O2EkX6gM6xfJd7FBXBY5purtLx7fUiZ7Hw=="; }; }; "@types/nedb-1.8.11" = { @@ -211,13 +220,13 @@ let sha512 = "qHQRLZ0e6l/XK/2Qb2v5N1ujmdttYkUvnRI4nPIifMy6vYwoAnER10xhX13isWjjQtNsrjNLinZgDDguzPmEKw=="; }; }; - "@types/node-14.14.20" = { + "@types/node-14.14.41" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.20"; + version = "14.14.41"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.20.tgz"; - sha512 = "Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.41.tgz"; + sha512 = "dueRKfaJL4RTtSa7bWeTK1M+VH+Gns73oCgzvYfHZywRCoPSd8EkXBL0mZ9unPTveBn+D9phZBaxuzpwjWkW0g=="; }; }; "@types/node-emoji-1.8.1" = { @@ -229,13 +238,13 @@ let sha512 = "0fRfA90FWm6KJfw6P9QGyo0HDTCmthZ7cWaBQndITlaWLTZ6njRyKwrwpzpg+n6kBXBIGKeUHEQuBx7bphGJkA=="; }; }; - "@types/nunjucks-3.1.3" = { + "@types/nunjucks-3.1.4" = { name = "_at_types_slash_nunjucks"; packageName = "@types/nunjucks"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.3.tgz"; - sha512 = "42IiIIBdoB7ZDwCVhCWYT4fMCj+4TeacuVgh7xyT2du5EhkpA+OFeeDdYTFCUt1MrHb8Aw7ZqFvr8s1bwP9l8w=="; + url = "https://registry.npmjs.org/@types/nunjucks/-/nunjucks-3.1.4.tgz"; + sha512 = "cR65PLlHKW/qxxj840dbNb3ICO+iAVQzaNKJ8TcKOVKFi+QcAkhw9SCY8VFAyU41SmJMs+2nrIN2JGhX+jYb7A=="; }; }; "@types/p-queue-2.3.2" = { @@ -247,13 +256,13 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; - "@types/qs-6.9.5" = { + "@types/qs-6.9.6" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.5"; + version = "6.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.5.tgz"; - sha512 = "/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.6.tgz"; + sha512 = "0/HnwIfW4ki2D8L8c9GVcG5I72s9jP5GSLVF0VIXDW00kmIpA6O33G7a8n59Tmh7Nz0WUC3rSb7PTY/sdW2JzA=="; }; }; "@types/randomstring-1.1.6" = { @@ -283,13 +292,13 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/serve-static-1.13.8" = { + "@types/serve-static-1.13.9" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.8.tgz"; - sha512 = "MoJhSQreaVoL+/hurAZzIm8wafFR6ajiTM1m4A0kv6AGeVBl4r4pOV8bGFrjjq1sGxDTnCoF8i22o0/aE5XCyA=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.9.tgz"; + sha512 = "ZFqF6qa48XsPdjXV5Gsz0Zqmux2PerNd3a/ktL45mHpa19cuMi/cL8tcxdAx497yRh+QtYPuofjT9oWw9P7nkA=="; }; }; "@types/uuid-8.3.0" = { @@ -310,13 +319,13 @@ let sha512 = "Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ=="; }; }; - "@types/yargs-15.0.12" = { + "@types/yargs-15.0.13" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; - version = "15.0.12"; + version = "15.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.12.tgz"; - sha512 = "f+fD/fQAo3BCbCDlrUpznF1A5Zp9rB0noS5vnoormHSIPFKL0Z2DcUJ3Gxp5ytH4uLRNxy7AwYUC9exZzqGMAw=="; + url = "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.13.tgz"; + sha512 = "kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ=="; }; }; "@types/yargs-parser-15.0.0" = { @@ -328,76 +337,76 @@ let sha512 = "FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw=="; }; }; - "@typescript-eslint/eslint-plugin-4.13.0" = { + "@typescript-eslint/eslint-plugin-4.22.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz"; - sha512 = "ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.0.tgz"; + sha512 = "U8SP9VOs275iDXaL08Ln1Fa/wLXfj5aTr/1c0t0j6CdbOnxh+TruXu1p4I0NAvdPBQgoPjHsgKn28mOi0FzfoA=="; }; }; - "@typescript-eslint/eslint-plugin-tslint-4.13.0" = { + "@typescript-eslint/eslint-plugin-tslint-4.22.0" = { name = "_at_typescript-eslint_slash_eslint-plugin-tslint"; packageName = "@typescript-eslint/eslint-plugin-tslint"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.13.0.tgz"; - sha512 = "r6n4irL74bOx4z2f0WxnwG6MY67EESvjvK/VMoIlDelW3Q6cwunCH8ug3l8hkPtgJ7iObmUjpAWKxyF4ZdvEcw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin-tslint/-/eslint-plugin-tslint-4.22.0.tgz"; + sha512 = "r4lhAPmd69ohf5grgDALtekETv4WVCpvfXtT3Nf3UUO/88sn4HB4h8xN1afwL48BprQ4TxH7ZUv7Ou6xgRlkAA=="; }; }; - "@typescript-eslint/experimental-utils-4.13.0" = { + "@typescript-eslint/experimental-utils-4.22.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz"; - sha512 = "/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.0.tgz"; + sha512 = "xJXHHl6TuAxB5AWiVrGhvbGL8/hbiCQ8FiWwObO3r0fnvBdrbWEDy1hlvGQOAWc6qsCWuWMKdVWlLAEMpxnddg=="; }; }; - "@typescript-eslint/parser-4.13.0" = { + "@typescript-eslint/parser-4.22.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.13.0.tgz"; - sha512 = "KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz"; + sha512 = "z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q=="; }; }; - "@typescript-eslint/scope-manager-4.13.0" = { + "@typescript-eslint/scope-manager-4.22.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz"; - sha512 = "UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.22.0.tgz"; + sha512 = "OcCO7LTdk6ukawUM40wo61WdeoA7NM/zaoq1/2cs13M7GyiF+T4rxuA4xM+6LeHWjWbss7hkGXjFDRcKD4O04Q=="; }; }; - "@typescript-eslint/types-4.13.0" = { + "@typescript-eslint/types-4.22.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.13.0.tgz"; - sha512 = "/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.22.0.tgz"; + sha512 = "sW/BiXmmyMqDPO2kpOhSy2Py5w6KvRRsKZnV0c4+0nr4GIcedJwXAq+RHNK4lLVEZAJYFltnnk1tJSlbeS9lYA=="; }; }; - "@typescript-eslint/typescript-estree-4.13.0" = { + "@typescript-eslint/typescript-estree-4.22.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz"; - sha512 = "9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.0.tgz"; + sha512 = "TkIFeu5JEeSs5ze/4NID+PIcVjgoU3cUQUIZnH3Sb1cEn1lBo7StSV5bwPuJQuoxKXlzAObjYTilOEKRuhR5yg=="; }; }; - "@typescript-eslint/visitor-keys-4.13.0" = { + "@typescript-eslint/visitor-keys-4.22.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.13.0"; + version = "4.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz"; - sha512 = "6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.0.tgz"; + sha512 = "nnMu4F+s4o0sll6cBSsTeVsT4cwxB7zECK3dFxzEjPBii9xLpq4yqqsy/FU5zMfan6G60DKZSCXAa3sHJZrcYw=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -473,13 +482,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-7.0.3" = { + "ajv-8.1.0" = { name = "ajv"; packageName = "ajv"; - version = "7.0.3"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-7.0.3.tgz"; - sha512 = "R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz"; + sha512 = "B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ=="; }; }; "another-json-0.2.0" = { @@ -509,15 +518,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-4.1.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; - }; - }; "ansi-regex-5.0.0" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -545,13 +545,13 @@ let sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; }; }; - "anymatch-3.1.1" = { + "anymatch-3.1.2" = { name = "anymatch"; packageName = "anymatch"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; - sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"; + sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; }; }; "arg-4.1.3" = { @@ -725,13 +725,13 @@ let sha512 = "dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base-x-3.0.8" = { @@ -761,13 +761,13 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "binary-extensions-2.1.0" = { + "binary-extensions-2.2.0" = { name = "binary-extensions"; packageName = "binary-extensions"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz"; - sha512 = "1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ=="; + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; + sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; }; }; "binary-search-tree-0.2.5" = { @@ -869,6 +869,15 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; @@ -878,15 +887,6 @@ let sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; - "camelcase-5.3.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "5.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - }; "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; @@ -905,13 +905,13 @@ let sha1 = "1b681c21ff84033c826543090689420d187151dc"; }; }; - "chai-4.2.0" = { + "chai-4.3.4" = { name = "chai"; packageName = "chai"; - version = "4.2.0"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz"; - sha512 = "XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw=="; + url = "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz"; + sha512 = "yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA=="; }; }; "chalk-2.4.2" = { @@ -941,31 +941,13 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; - "chokidar-3.4.1" = { + "chokidar-3.5.1" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; - sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; - }; - }; - "chokidar-3.4.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.3.tgz"; - sha512 = "DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ=="; - }; - }; - "cliui-5.0.0" = { - name = "cliui"; - packageName = "cliui"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz"; - sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz"; + sha512 = "9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw=="; }; }; "cliui-7.0.4" = { @@ -1166,15 +1148,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.2.0" = { - name = "debug"; - packageName = "debug"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz"; - sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; - }; - }; "debug-4.3.1" = { name = "debug"; packageName = "debug"; @@ -1184,15 +1157,6 @@ let sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; }; }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; "decamelize-4.0.0" = { name = "decamelize"; packageName = "decamelize"; @@ -1265,6 +1229,15 @@ let sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; }; }; + "diff-5.0.0" = { + name = "diff"; + packageName = "diff"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz"; + sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -1301,15 +1274,6 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "emoji-regex-7.0.3" = { - name = "emoji-regex"; - packageName = "emoji-regex"; - version = "7.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"; - sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="; - }; - }; "emoji-regex-8.0.0" = { name = "emoji-regex"; packageName = "emoji-regex"; @@ -1382,13 +1346,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-7.17.0" = { + "eslint-7.24.0" = { name = "eslint"; packageName = "eslint"; - version = "7.17.0"; + version = "7.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.17.0.tgz"; - sha512 = "zJk08MiBgwuGoxes5sSQhOtibZ75pz0J35XTRlZOk9xMffhpA9BTbQZxoXZzOl5zMbleShbGwtw+1kGferfFwQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz"; + sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; "eslint-plugin-jsdoc-30.7.13" = { @@ -1400,13 +1364,13 @@ let sha512 = "YM4WIsmurrp0rHX6XiXQppqKB8Ne5ATiZLJe2+/fkp9l9ExXFr43BbAbjZaVrpCT+tuPYOZ8k1MICARHnURUNQ=="; }; }; - "eslint-plugin-prefer-arrow-1.2.2" = { + "eslint-plugin-prefer-arrow-1.2.3" = { name = "eslint-plugin-prefer-arrow"; packageName = "eslint-plugin-prefer-arrow"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.2.tgz"; - sha512 = "C8YMhL+r8RMeMdYAw/rQtE6xNdMulj+zGWud/qIGnlmomiPRaLDGLMeskZ3alN6uMBojmooRimtdrXebLN4svQ=="; + url = "https://registry.npmjs.org/eslint-plugin-prefer-arrow/-/eslint-plugin-prefer-arrow-1.2.3.tgz"; + sha512 = "J9I5PKCOJretVuiZRGvPQxCbllxGAV/viI20JO3LYblAodofBxyMnZAJ+WGeClHgANnSJberTNoFWWjrWKBuXQ=="; }; }; "eslint-scope-5.1.1" = { @@ -1463,13 +1427,13 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; "esrecurse-4.3.0" = { @@ -1571,13 +1535,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.4" = { + "fast-glob-3.2.5" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz"; - sha512 = "kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz"; + sha512 = "2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -1607,13 +1571,13 @@ let sha512 = "q8BZ89jjc+mz08rSxROs8VsrBBcn1SIw1kq9NjolL509tkABRk9io01RAjSaEv1Xb2uFLt8VtRiZbGp5H8iDtg=="; }; }; - "fastq-1.10.0" = { + "fastq-1.11.0" = { name = "fastq"; packageName = "fastq"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.10.0.tgz"; - sha512 = "NL2Qc5L3iQEsyYzweq7qfgy5OtXCmGzGvhElGEd/SoFWEMOEczNh5s5ocaF01HDetxz+p8ecjNPA6cZxxIHmzA=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; + sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; }; }; "fecha-4.2.0" = { @@ -1625,13 +1589,13 @@ let sha512 = "aN3pcx/DSmtyoovUudctc8+6Hl4T+hI9GBBHLjA76jdZl7+b1sgh5g4k+u/GL3dTy1/pnYzKp69FpJ0OicE3Wg=="; }; }; - "file-entry-cache-6.0.0" = { + "file-entry-cache-6.0.1" = { name = "file-entry-cache"; packageName = "file-entry-cache"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; - sha512 = "fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA=="; + url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; }; "file-stream-rotator-0.5.7" = { @@ -1661,15 +1625,6 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; - "find-up-3.0.0" = { - name = "find-up"; - packageName = "find-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - }; "find-up-5.0.0" = { name = "find-up"; packageName = "find-up"; @@ -1706,13 +1661,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.1.0" = { + "flatted-3.1.1" = { name = "flatted"; packageName = "flatted"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.0.tgz"; - sha512 = "tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; + sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; }; }; "fn.name-1.1.0" = { @@ -1787,13 +1742,22 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fsevents-2.1.3" = { + "fsevents-2.3.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.3"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; - sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"; + sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; "functional-red-black-tree-1.0.1" = { @@ -1841,6 +1805,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -1859,13 +1832,13 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "globals-12.4.0" = { @@ -1877,13 +1850,22 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globby-11.0.2" = { + "globals-13.8.0" = { + name = "globals"; + packageName = "globals"; + version = "13.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.8.0.tgz"; + sha512 = "rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q=="; + }; + }; + "globby-11.0.3" = { name = "globby"; packageName = "globby"; - version = "11.0.2"; + version = "11.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.2.tgz"; - sha512 = "2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og=="; + url = "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz"; + sha512 = "ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg=="; }; }; "growl-1.10.5" = { @@ -1913,6 +1895,15 @@ let sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; }; }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -1931,6 +1922,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; "he-1.2.0" = { name = "he"; packageName = "he"; @@ -2057,6 +2057,15 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; + "is-boolean-object-1.1.0" = { + name = "is-boolean-object"; + packageName = "is-boolean-object"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; + sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; + }; + }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -2120,6 +2129,15 @@ let sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; + "is-number-object-1.0.4" = { + name = "is-number-object"; + packageName = "is-number-object"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; + sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; + }; + }; "is-plain-obj-2.1.0" = { name = "is-plain-obj"; packageName = "is-plain-obj"; @@ -2156,6 +2174,15 @@ let sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; }; }; + "is-string-1.0.5" = { + name = "is-string"; + packageName = "is-string"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; + sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -2201,13 +2228,13 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.14.0" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.14.0"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz"; - sha512 = "/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "js-yaml-4.0.0" = { @@ -2219,6 +2246,15 @@ let sha512 = "pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q=="; }; }; + "js-yaml-4.1.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"; + sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; + }; + }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -2336,15 +2372,6 @@ let sha512 = "1TulyYfc4udS7ECSBT2vwJksWbkwwTX8BzeUIiq8Y07Riy7bDAAnxDaPU/tWyOVmQAcWJIEIFP9lPfBGqVoPgQ=="; }; }; - "locate-path-3.0.0" = { - name = "locate-path"; - packageName = "locate-path"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - }; "locate-path-6.0.0" = { name = "locate-path"; packageName = "locate-path"; @@ -2363,6 +2390,33 @@ let sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; + "lodash-4.17.21" = { + name = "lodash"; + packageName = "lodash"; + version = "4.17.21"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"; + sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; + }; + }; + "lodash.clonedeep-4.5.0" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -2372,6 +2426,15 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; + "lodash.truncate-4.4.2" = { + name = "lodash.truncate"; + packageName = "lodash.truncate"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + }; "log-symbols-4.0.0" = { name = "log-symbols"; packageName = "log-symbols"; @@ -2417,31 +2480,31 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "matrix-appservice-0.7.1" = { + "matrix-appservice-0.8.0" = { name = "matrix-appservice"; packageName = "matrix-appservice"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.7.1.tgz"; - sha512 = "oUjEz+eKfBw66FnQ3/D7PWcq+/oq9gzJVlNOMQUSGXgK70o8JT3toeFMYsJChaIimU5fIsHbTVyHC+eVGb7MSQ=="; + url = "https://registry.npmjs.org/matrix-appservice/-/matrix-appservice-0.8.0.tgz"; + sha512 = "mfgMpmV3dWLtzrd4V/3XtqUD0P44I/mTgsRreW5jMhSaUnnRGZbpptBw2q4/axbLjw2FarlWtOVgertDGMtccA=="; }; }; - "matrix-appservice-bridge-2.5.0" = { + "matrix-appservice-bridge-2.6.0" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.5.0.tgz"; - sha512 = "L5Ddb78pqqfO6xM4SYM+Hv6N5VjmLF3D24h4g5ze5+xRfEFmfvmLdVu6rvIExawvk9i+LA0fZ95Qi3hc7SkgAQ=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-2.6.0.tgz"; + sha512 = "o1KHQHG1GdfUhTFBXVLztwbTowuCFO9/h8n2zdkRK/bZsdcXSFQVfUwDtRULcyinD4N7r0Lrwlg1LyR0pg2WSw=="; }; }; - "matrix-js-sdk-9.6.0" = { + "matrix-js-sdk-9.11.0" = { name = "matrix-js-sdk"; packageName = "matrix-js-sdk"; - version = "9.6.0"; + version = "9.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.6.0.tgz"; - sha512 = "zoNqB7z0C0QDncN7yD1K50c4C88VPofWaCQ0gNXqO/Ac1dr/xLF/46iNF9Y+dBwq7siBO9wEh20WFHMaRpeLOg=="; + url = "https://registry.npmjs.org/matrix-js-sdk/-/matrix-js-sdk-9.11.0.tgz"; + sha512 = "wP28ybOxyQ7lbC48QddRORYr8atEwbTqDOsu8H6u9jTTgB2qqczI/bkSoXHtutODuSeLY5x0UuwLcxVCy4yxVQ=="; }; }; "media-typer-0.3.0" = { @@ -2480,13 +2543,13 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.4" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; + sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; "mime-1.6.0" = { @@ -2543,22 +2606,22 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mocha-8.2.1" = { + "mocha-8.3.2" = { name = "mocha"; packageName = "mocha"; - version = "8.2.1"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; - sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.3.2.tgz"; + sha512 = "UdmISwr/5w+uXLPKspgoV7/RXZwKRTiTjJ2/AC5ZiEztIoOYdfKb19+9jNmEInzx5pBsCyJQzarAxqIGBNYJhg=="; }; }; - "moment-2.24.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; "morgan-1.10.0" = { @@ -2597,13 +2660,22 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; - "nanoid-3.1.12" = { + "ms-2.1.3" = { + name = "ms"; + packageName = "ms"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"; + sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; + }; + }; + "nanoid-3.1.20" = { name = "nanoid"; packageName = "nanoid"; - version = "3.1.12"; + version = "3.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz"; - sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.20.tgz"; + sha512 = "a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw=="; }; }; "natural-compare-1.4.0" = { @@ -2660,13 +2732,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "nunjucks-3.2.2" = { + "nunjucks-3.2.3" = { name = "nunjucks"; packageName = "nunjucks"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz"; - sha512 = "KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA=="; + url = "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz"; + sha512 = "psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ=="; }; }; "oauth-sign-0.9.0" = { @@ -2678,13 +2750,22 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-hash-2.0.3" = { + "object-hash-2.1.1" = { name = "object-hash"; packageName = "object-hash"; - version = "2.0.3"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz"; - sha512 = "JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg=="; + url = "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz"; + sha512 = "VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ=="; + }; + }; + "object-inspect-1.9.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; + sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; }; }; "on-finished-2.3.0" = { @@ -2750,15 +2831,6 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.3.0" = { - name = "p-limit"; - packageName = "p-limit"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - }; "p-limit-3.1.0" = { name = "p-limit"; packageName = "p-limit"; @@ -2768,15 +2840,6 @@ let sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; }; }; - "p-locate-3.0.0" = { - name = "p-locate"; - packageName = "p-locate"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - }; "p-locate-5.0.0" = { name = "p-locate"; packageName = "p-locate"; @@ -2822,15 +2885,6 @@ let sha512 = "rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg=="; }; }; - "p-try-2.2.0" = { - name = "p-try"; - packageName = "p-try"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -2858,15 +2912,6 @@ let sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; }; }; - "path-exists-3.0.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; - }; - }; "path-exists-4.0.0" = { name = "path-exists"; packageName = "path-exists"; @@ -2912,13 +2957,13 @@ let sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; - "pathval-1.1.0" = { + "pathval-1.1.1" = { name = "pathval"; packageName = "pathval"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz"; - sha1 = "b942e6d4bde653005ef6b71361def8727d0645e0"; + url = "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz"; + sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; }; }; "performance-now-2.1.0" = { @@ -2939,13 +2984,13 @@ let sha512 = "9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw=="; }; }; - "pg-connection-string-2.4.0" = { + "pg-connection-string-2.5.0" = { name = "pg-connection-string"; packageName = "pg-connection-string"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.4.0.tgz"; - sha512 = "3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ=="; + url = "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.5.0.tgz"; + sha512 = "r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ=="; }; }; "pg-int8-1.0.1" = { @@ -2966,31 +3011,31 @@ let sha512 = "1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg=="; }; }; - "pg-pool-3.2.2" = { + "pg-pool-3.3.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.2"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; - sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.3.0.tgz"; + sha512 = "0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg=="; }; }; - "pg-promise-10.8.7" = { + "pg-promise-10.10.1" = { name = "pg-promise"; packageName = "pg-promise"; - version = "10.8.7"; + version = "10.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.8.7.tgz"; - sha512 = "gSbH+NYWD4pVOpacP9uS2xH84N7nb7K4ubKlcZchhDr8ixnIURPnNJmNLJcRgtOocpjzsKymYSm6rCFZVOngSA=="; + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.10.1.tgz"; + sha512 = "sopmuOr2PrUNh3XI0Y15ssmjcwhZnGHyGYwuDDmWFnBydq7lvrhTMBI3hefAp3YMx07+HSXfSpJse9z5vC4bsw=="; }; }; - "pg-protocol-1.4.0" = { + "pg-protocol-1.5.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.4.0.tgz"; - sha512 = "El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; + sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; }; }; "pg-types-2.2.0" = { @@ -3011,13 +3056,13 @@ let sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.2.3" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz"; + sha512 = "KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg=="; }; }; "postgres-array-2.0.0" = { @@ -3119,6 +3164,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "qs-6.10.1" = { + name = "qs"; + packageName = "qs"; + version = "6.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.1.tgz"; + sha512 = "M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg=="; + }; + }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -3137,13 +3191,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.6" = { - name = "qs"; - packageName = "qs"; - version = "6.9.6"; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; "quick-lru-5.1.1" = { @@ -3191,15 +3245,6 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "readable-stream-2.3.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; - sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; - }; - }; "readable-stream-2.3.7" = { name = "readable-stream"; packageName = "readable-stream"; @@ -3218,15 +3263,6 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.4.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; - sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; - }; - }; "readdirp-3.5.0" = { name = "readdirp"; packageName = "readdirp"; @@ -3290,15 +3326,6 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "require-main-filename-2.0.0" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - }; "resolve-from-4.0.0" = { name = "resolve-from"; packageName = "resolve-from"; @@ -3335,13 +3362,13 @@ let sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; }; }; - "run-parallel-1.1.10" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.10"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; - sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; "safe-buffer-5.1.2" = { @@ -3407,15 +3434,6 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; "setprototypeof-1.1.1" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -3443,6 +3461,15 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; + "side-channel-1.0.4" = { + name = "side-channel"; + packageName = "side-channel"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"; + sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; + }; + }; "simple-swizzle-0.2.2" = { name = "simple-swizzle"; packageName = "simple-swizzle"; @@ -3578,15 +3605,6 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-3.1.0" = { - name = "string-width"; - packageName = "string-width"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"; - sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; - }; - }; "string-width-4.2.0" = { name = "string-width"; packageName = "string-width"; @@ -3623,15 +3641,6 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "strip-ansi-5.2.0" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"; - sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; - }; - }; "strip-ansi-6.0.0" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -3668,13 +3677,22 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "table-6.0.7" = { + "supports-color-8.1.1" = { + name = "supports-color"; + packageName = "supports-color"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"; + sha512 = "MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q=="; + }; + }; + "table-6.2.0" = { name = "table"; packageName = "table"; - version = "6.0.7"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.0.7.tgz"; - sha512 = "rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g=="; + url = "https://registry.npmjs.org/table/-/table-6.2.0.tgz"; + sha512 = "WMBBLuauiLXJjth35K4vOnd/xkaZ/dxEcyoZ+YhxSwfxFqvh+av06+oRqIwbR14m1lENB1egSWOFv/bNEt2D8A=="; }; }; "tdigest-0.1.1" = { @@ -3758,13 +3776,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tsutils-3.19.1" = { + "tsutils-3.21.0" = { name = "tsutils"; packageName = "tsutils"; - version = "3.19.1"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsutils/-/tsutils-3.19.1.tgz"; - sha512 = "GEdoBf5XI324lu7ycad7s6laADfnAqCw6wLGI+knxvw9vsIYBaJfYdmeCEG3FMMUiSm3OGgNb+m6utsWf5h9Vw=="; + url = "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"; + sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; }; }; "tunnel-agent-0.6.0" = { @@ -3803,6 +3821,15 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; + "type-fest-0.20.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.20.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"; + sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; + }; + }; "type-fest-0.8.1" = { name = "type-fest"; packageName = "type-fest"; @@ -3821,13 +3848,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.1.3" = { + "typescript-4.2.4" = { name = "typescript"; packageName = "typescript"; - version = "4.1.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz"; - sha512 = "B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz"; + sha512 = "V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="; }; }; "underscore-1.4.4" = { @@ -3902,13 +3929,13 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "v8-compile-cache-2.2.0" = { + "v8-compile-cache-2.3.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; - sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; "vary-1.1.2" = { @@ -3938,15 +3965,6 @@ let sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; }; - "which-module-2.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; - }; - }; "wide-align-1.1.3" = { name = "wide-align"; packageName = "wide-align"; @@ -3965,22 +3983,13 @@ let sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; }; }; - "winston-daily-rotate-file-4.5.0" = { + "winston-daily-rotate-file-4.5.2" = { name = "winston-daily-rotate-file"; packageName = "winston-daily-rotate-file"; - version = "4.5.0"; + version = "4.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.0.tgz"; - sha512 = "/HqeWiU48dzGqcrABRlxYWVMdL6l3uKCtFSJyrqK+E2rLnSFNsgYpvwx15EgTitBLNzH69lQd/+z2ASryV2aqw=="; - }; - }; - "winston-transport-4.3.0" = { - name = "winston-transport"; - packageName = "winston-transport"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.3.0.tgz"; - sha512 = "B2wPuwUi3vhzn/51Uukcao4dIduEiPOcOt9HJ3QeaXgkJ5Z7UwpBzxS4ZGNHtrxrUvTwemsQiSys0ihOf8Mp1A=="; + url = "https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.5.2.tgz"; + sha512 = "DpAz9djExzFGVGRIKCKzsjOQaIINbjOUJ8CRsZGz0SQOMMcO1kM7jqTdzQAM9CRTEksZV9bBw9TT0ddQBGxs9g=="; }; }; "winston-transport-4.4.0" = { @@ -4001,22 +4010,13 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "workerpool-6.0.2" = { + "workerpool-6.1.0" = { name = "workerpool"; packageName = "workerpool"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/workerpool/-/workerpool-6.0.2.tgz"; - sha512 = "DSNyvOpFKrNusaaUwk+ej6cBj1bmhLcBfj80elGk+ZIo5JSkq+unB1dLKEOcNfJDZgjGICfhQ0Q5TbP0PvF4+Q=="; - }; - }; - "wrap-ansi-5.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz"; - sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; + url = "https://registry.npmjs.org/workerpool/-/workerpool-6.1.0.tgz"; + sha512 = "toV7q9rWNYha963Pl/qyeZ6wG+3nnsyvolaNUS8+R5Wtw6qJPTxIlOP1ZSvcGhEJw+l3HMMmtiNo9Gl61G4GVg=="; }; }; "wrap-ansi-7.0.0" = { @@ -4055,15 +4055,6 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-4.0.1" = { - name = "y18n"; - packageName = "y18n"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz"; - sha512 = "wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ=="; - }; - }; "y18n-5.0.5" = { name = "y18n"; packageName = "y18n"; @@ -4082,15 +4073,6 @@ let sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yargs-13.3.2" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz"; - sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; - }; - }; "yargs-16.2.0" = { name = "yargs"; packageName = "yargs"; @@ -4100,15 +4082,6 @@ let sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; }; }; - "yargs-parser-13.1.2" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz"; - sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg=="; - }; - }; "yargs-parser-20.2.4" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -4149,23 +4122,25 @@ let args = { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.7.0"; + version = "1.8.0"; src = ./.; dependencies = [ sources."@babel/code-frame-7.12.11" sources."@babel/helper-validator-identifier-7.12.11" - (sources."@babel/highlight-7.10.4" // { + (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" ]; }) - sources."@babel/runtime-7.12.13" + sources."@babel/runtime-7.13.10" sources."@dabh/diagnostics-2.0.2" - (sources."@eslint/eslintrc-0.2.2" // { + (sources."@eslint/eslintrc-0.4.0" // { dependencies = [ sources."debug-4.3.1" + sources."globals-12.4.0" sources."ignore-4.0.6" + sources."js-yaml-3.14.1" sources."ms-2.1.2" ]; }) @@ -4185,51 +4160,52 @@ let ]; }) sources."@types/body-parser-1.19.0" - sources."@types/chai-4.2.14" + sources."@types/chai-4.2.16" sources."@types/connect-3.4.34" - sources."@types/express-4.17.10" - sources."@types/express-serve-static-core-4.17.18" + sources."@types/express-4.17.11" + sources."@types/express-serve-static-core-4.17.19" sources."@types/is-stream-1.1.0" - sources."@types/json-schema-7.0.6" - sources."@types/mime-2.0.3" - sources."@types/mocha-8.2.0" + sources."@types/js-yaml-4.0.0" + sources."@types/json-schema-7.0.7" + sources."@types/mime-1.3.2" + sources."@types/mocha-8.2.2" sources."@types/nedb-1.8.11" - sources."@types/node-14.14.20" + sources."@types/node-14.14.41" sources."@types/node-emoji-1.8.1" - sources."@types/nunjucks-3.1.3" + sources."@types/nunjucks-3.1.4" sources."@types/p-queue-2.3.2" - sources."@types/qs-6.9.5" + sources."@types/qs-6.9.6" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/retry-0.12.0" - sources."@types/serve-static-1.13.8" + sources."@types/serve-static-1.13.9" sources."@types/uuid-8.3.0" sources."@types/ws-7.2.6" - sources."@types/yargs-15.0.12" + sources."@types/yargs-15.0.13" sources."@types/yargs-parser-15.0.0" - (sources."@typescript-eslint/eslint-plugin-4.13.0" // { + (sources."@typescript-eslint/eslint-plugin-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/eslint-plugin-tslint-4.13.0" - sources."@typescript-eslint/experimental-utils-4.13.0" - (sources."@typescript-eslint/parser-4.13.0" // { + sources."@typescript-eslint/eslint-plugin-tslint-4.22.0" + sources."@typescript-eslint/experimental-utils-4.22.0" + (sources."@typescript-eslint/parser-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-4.13.0" - sources."@typescript-eslint/types-4.13.0" - (sources."@typescript-eslint/typescript-estree-4.13.0" // { + sources."@typescript-eslint/scope-manager-4.22.0" + sources."@typescript-eslint/types-4.22.0" + (sources."@typescript-eslint/typescript-estree-4.22.0" // { dependencies = [ sources."debug-4.3.1" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/visitor-keys-4.13.0" + sources."@typescript-eslint/visitor-keys-4.22.0" sources."@ungap/promise-all-settled-1.1.2" sources."Slackdown-git://github.com/half-shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."a-sync-waterfall-1.0.1" @@ -4242,7 +4218,7 @@ let sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."anymatch-3.1.1" + sources."anymatch-3.1.2" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" @@ -4260,11 +4236,11 @@ let sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."axios-0.21.1" - sources."balanced-match-1.0.0" + sources."balanced-match-1.0.2" sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" - sources."binary-extensions-2.1.0" + sources."binary-extensions-2.2.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."body-parser-1.19.0" @@ -4276,10 +4252,11 @@ let sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" sources."bytes-3.1.0" + sources."call-bind-1.0.2" sources."callsites-3.1.0" - sources."camelcase-5.3.1" + sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chai-4.2.0" + sources."chai-4.3.4" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -4290,16 +4267,7 @@ let ]; }) sources."check-error-1.0.2" - sources."chokidar-3.4.1" - (sources."cliui-5.0.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."chokidar-3.5.1" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -4307,6 +4275,7 @@ let sources."colors-1.3.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" + sources."commander-5.1.0" sources."comment-parser-0.7.6" sources."concat-map-0.0.1" sources."content-disposition-0.5.3" @@ -4318,7 +4287,7 @@ let sources."cross-spawn-7.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decamelize-1.2.0" + sources."decamelize-4.0.0" sources."deep-eql-3.0.1" sources."deep-is-0.1.3" sources."delayed-stream-1.0.0" @@ -4336,10 +4305,12 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" - (sources."eslint-7.17.0" // { + (sources."eslint-7.24.0" // { dependencies = [ sources."debug-4.3.1" sources."ignore-4.0.6" + sources."js-yaml-3.14.1" + sources."lodash-4.17.21" sources."ms-2.1.2" ]; }) @@ -4349,7 +4320,7 @@ let sources."ms-2.1.2" ]; }) - sources."eslint-plugin-prefer-arrow-1.2.2" + sources."eslint-plugin-prefer-arrow-1.2.3" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -4363,7 +4334,7 @@ let ]; }) sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.2.0" ]; @@ -4381,12 +4352,12 @@ let sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.4" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.6" - sources."fastq-1.10.0" - sources."file-entry-cache-6.0.0" + sources."fastq-1.11.0" + sources."file-entry-cache-6.0.1" sources."file-stream-rotator-0.5.7" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -4394,7 +4365,7 @@ let sources."finity-0.5.4" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.0" + sources."flatted-3.1.1" sources."fn.name-1.1.0" sources."follow-redirects-1.13.1" sources."forever-agent-0.6.1" @@ -4402,21 +4373,29 @@ let sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.3.2" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" sources."get-func-name-2.0.0" + sources."get-intrinsic-1.1.1" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.1" - sources."globals-12.4.0" - sources."globby-11.0.2" + sources."glob-parent-5.1.2" + (sources."globals-13.8.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."globby-11.0.3" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-symbols-1.0.2" sources."he-1.2.0" sources."http-errors-1.7.2" sources."http-signature-1.2.0" @@ -4430,21 +4409,28 @@ let sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-number-7.0.0" + sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" sources."is-property-1.0.2" sources."is-stream-1.1.0" + sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.0" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."jsbn-0.1.1" sources."jsdoctypeparser-9.0.0" sources."json-schema-0.2.3" @@ -4459,7 +4445,10 @@ let sources."localforage-1.7.3" sources."locate-path-6.0.0" sources."lodash-4.17.20" + sources."lodash.clonedeep-4.5.0" + sources."lodash.flatten-4.4.0" sources."lodash.toarray-4.4.0" + sources."lodash.truncate-4.4.2" sources."log-symbols-4.0.0" (sources."logform-2.2.0" // { dependencies = [ @@ -4470,74 +4459,62 @@ let sources."loglevel-1.7.1" sources."lru-cache-6.0.0" sources."make-error-1.3.6" - sources."matrix-appservice-0.7.1" - (sources."matrix-appservice-bridge-2.5.0" // { + (sources."matrix-appservice-0.8.0" // { dependencies = [ - sources."argparse-2.0.1" - sources."js-yaml-4.0.0" + sources."argparse-1.0.10" + sources."js-yaml-3.14.1" ]; }) - (sources."matrix-js-sdk-9.6.0" // { + sources."matrix-appservice-bridge-2.6.0" + (sources."matrix-js-sdk-9.11.0" // { dependencies = [ - sources."qs-6.9.6" + sources."qs-6.10.1" ]; }) sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-4.0.2" + sources."micromatch-4.0.4" sources."mime-1.6.0" sources."mime-db-1.40.0" sources."mime-types-2.1.24" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.2.1" // { + (sources."mocha-8.3.2" // { dependencies = [ - sources."ansi-regex-4.1.0" - sources."chokidar-3.4.3" - sources."debug-4.2.0" - sources."emoji-regex-7.0.3" - sources."has-flag-4.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."locate-path-3.0.0" - sources."ms-2.1.2" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."readdirp-3.5.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."supports-color-7.2.0" - (sources."yargs-13.3.2" // { + sources."argparse-2.0.1" + (sources."debug-4.3.1" // { dependencies = [ - sources."find-up-3.0.0" + sources."ms-2.1.2" ]; }) + sources."diff-5.0.0" + sources."has-flag-4.0.0" + sources."js-yaml-4.0.0" + sources."ms-2.1.3" + sources."supports-color-8.1.1" ]; }) - sources."moment-2.24.0" + sources."moment-2.29.1" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" ]; }) sources."ms-2.0.0" - sources."nanoid-3.1.12" + sources."nanoid-3.1.20" sources."natural-compare-1.4.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - (sources."nunjucks-3.2.2" // { - dependencies = [ - sources."commander-5.1.0" - ]; - }) + sources."nunjucks-3.2.3" sources."oauth-sign-0.9.0" - sources."object-hash-2.0.3" + sources."object-hash-2.1.1" + sources."object-inspect-1.9.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -4554,7 +4531,6 @@ let }) sources."p-retry-4.2.0" sources."p-timeout-3.2.0" - sources."p-try-2.2.0" sources."packet-reader-1.0.0" sources."parent-module-1.0.1" sources."parseurl-1.3.3" @@ -4563,18 +4539,18 @@ let sources."path-key-3.1.1" sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" - sources."pathval-1.1.0" + sources."pathval-1.1.1" sources."performance-now-2.1.0" sources."pg-8.5.1" - sources."pg-connection-string-2.4.0" + sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" sources."pg-minify-1.6.2" - sources."pg-pool-3.2.2" - sources."pg-promise-10.8.7" - sources."pg-protocol-1.4.0" + sources."pg-pool-3.3.0" + sources."pg-promise-10.10.1" + sources."pg-protocol-1.5.0" sources."pg-types-2.2.0" sources."pgpass-1.0.4" - sources."picomatch-2.2.2" + sources."picomatch-2.2.3" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -4587,13 +4563,14 @@ let sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."randombytes-2.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" - sources."readdirp-3.4.0" + sources."readdirp-3.5.0" sources."regenerator-runtime-0.13.7" sources."regexpp-3.1.0" sources."regextras-0.7.1" @@ -4606,12 +4583,11 @@ let }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."require-main-filename-2.0.0" sources."resolve-from-4.0.0" sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.10" + sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.4" @@ -4622,10 +4598,10 @@ let }) sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" - sources."set-blocking-2.0.0" sources."setprototypeof-1.1.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."side-channel-1.0.4" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" (sources."slice-ansi-4.0.0" // { @@ -4655,9 +4631,9 @@ let sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.0.7" // { + (sources."table-6.2.0" // { dependencies = [ - sources."ajv-7.0.3" + sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" ]; }) @@ -4670,14 +4646,14 @@ let sources."triple-beam-1.3.0" sources."ts-node-9.1.1" sources."tslib-1.14.1" - sources."tsutils-3.19.1" + sources."tsutils-3.21.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" sources."type-detect-4.0.8" sources."type-fest-0.8.1" sources."type-is-1.6.18" - sources."typescript-4.1.3" + sources."typescript-4.2.4" sources."underscore-1.4.4" sources."unhomoglyph-1.0.6" sources."unpipe-1.0.0" @@ -4685,11 +4661,10 @@ let sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-8.3.2" - sources."v8-compile-cache-2.2.0" + sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-2.0.2" - sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -4710,28 +4685,18 @@ let }) ]; }) - sources."winston-daily-rotate-file-4.5.0" - (sources."winston-transport-4.3.0" // { + sources."winston-daily-rotate-file-4.5.2" + (sources."winston-transport-4.4.0" // { dependencies = [ - sources."readable-stream-2.3.6" + sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; }) sources."word-wrap-1.2.3" - sources."workerpool-6.0.2" - (sources."wrap-ansi-5.1.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - ]; - }) + sources."workerpool-6.1.0" sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xtend-4.0.2" - sources."y18n-4.0.1" sources."yallist-4.0.0" (sources."yargs-16.2.0" // { dependencies = [ @@ -4744,13 +4709,8 @@ let sources."yargs-parser-20.2.4" ]; }) - sources."yargs-parser-13.1.2" - (sources."yargs-unparser-2.0.0" // { - dependencies = [ - sources."camelcase-6.2.0" - sources."decamelize-4.0.0" - ]; - }) + sources."yargs-parser-20.2.4" + sources."yargs-unparser-2.0.0" sources."yn-3.1.1" sources."yocto-queue-0.1.0" ]; From 57f69430c1de3e3ec2e1178238f61757d6c96751 Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Fri, 7 May 2021 09:50:10 -0300 Subject: [PATCH 04/37] ferdi: 5.5.0 -> 5.6.0-beta.5 Add mesa (libgbm) to buildInputs at mkFranzDerivation to fix build of latest beta Signed-off-by: Bryan A. S --- .../networking/instant-messengers/ferdi/default.nix | 4 ++-- .../networking/instant-messengers/franz/generic.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index e4f8d3c99ee..da3d7ebb25f 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdi"; name = "Ferdi"; - version = "5.5.0"; + version = "5.6.0-beta.5"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k"; + sha256 = "sha256-fDUzYir53OQ3O4o9eG70sGD+FJ0/4SDNsTfh97WFRnQ="; }; meta = with lib; { description = "Combine your favorite messaging services into one application"; diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index 7bbad798233..08afad8b56f 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -23,6 +23,7 @@ , udev , libnotify , xdg-utils +, mesa }: # Helper function for building a derivation for Franz and forks. @@ -48,6 +49,7 @@ stdenv.mkDerivation rec { libXtst libXScrnSaver ]) ++ [ + mesa #libgbm gtk3 atk glib From b364139f2bab76d44970c064ab0160d36f30d54e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 13 May 2021 12:57:43 +0200 Subject: [PATCH 05/37] maintainers: remove pesterhazy Their last commit was caf43ad5af9 from 2015. Thank you for your contributions. --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/jekyll/default.nix | 2 +- pkgs/development/libraries/oracle-instantclient/default.nix | 2 +- pkgs/development/libraries/sqlite/tools.nix | 2 +- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e790c2c963..17b88a005f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7713,12 +7713,6 @@ githubId = 152312; name = "Periklis Tsirakidis"; }; - pesterhazy = { - email = "pesterhazy@gmail.com"; - github = "pesterhazy"; - githubId = 106328; - name = "Paulus Esterhazy"; - }; petabyteboy = { email = "milan@petabyte.dev"; github = "petabyteboy"; diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 57ff510d86e..8c25e3774b1 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -49,7 +49,7 @@ in bundlerApp { homepage = "https://jekyllrb.com/"; #changelog = "https://raw.githubusercontent.com/jekyll/jekyll/v${version}/History.markdown"; license = licenses.mit; - maintainers = with maintainers; [ pesterhazy ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix index c6efc901e8a..df7ce6fd4b1 100644 --- a/pkgs/development/libraries/oracle-instantclient/default.nix +++ b/pkgs/development/libraries/oracle-instantclient/default.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation { ''; license = licenses.unfree; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ pesterhazy flokli ]; + maintainers = with maintainers; [ flokli ]; hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/sqlite/tools.nix b/pkgs/development/libraries/sqlite/tools.nix index d260c4211ec..45bcda727ed 100644 --- a/pkgs/development/libraries/sqlite/tools.nix +++ b/pkgs/development/libraries/sqlite/tools.nix @@ -22,7 +22,7 @@ let inherit description homepage; downloadPage = http://sqlite.org/download.html; license = licenses.publicDomain; - maintainers = with maintainers; [ pesterhazy johnazoidberg ]; + maintainers = with maintainers; [ johnazoidberg ]; platforms = platforms.unix; }; }; From cab63ca8e8380db3b5b41bc092972c6297fda320 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 13 May 2021 21:15:49 +0000 Subject: [PATCH 06/37] galene: 0.3.3 -> 0.3.4 --- pkgs/servers/web-apps/galene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/galene/default.nix b/pkgs/servers/web-apps/galene/default.nix index d377b00a300..c24857d9dc5 100644 --- a/pkgs/servers/web-apps/galene/default.nix +++ b/pkgs/servers/web-apps/galene/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "galene"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "jech"; repo = "galene"; rev = "galene-${version}"; - sha256 = "sha256-8CgNMI7zOeDxrnmQNDM61Bgpw+N0sc7HR9c+YsQTO5I="; + sha256 = "sha256-yb+gEex4WEvIAEMuSTkw25rsBTL9tlfhf9qQtISWUd0="; }; - vendorSha256 = "sha256-qOHuZGMr0CPwy/DuuWYCDSe24Y6ivg1uQJGXCuKGV/M="; + vendorSha256 = "sha256-Vm7tTTQJyZZVbORl5ziy4GJ34kHh5dh0ojX/ZuTpshA="; outputs = [ "out" "static" ]; From ad96c7eb13fb886aefb563d4a81f352de70e0091 Mon Sep 17 00:00:00 2001 From: Marat Date: Thu, 13 May 2021 18:17:01 +0400 Subject: [PATCH 07/37] terraria-server: 1.4.1.2 -> 1.4.2.2 --- pkgs/games/terraria-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index de430d29622..b21f1008885 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "terraria-server"; - version = "1.4.1.2"; + version = "1.4.2.2"; urlVersion = lib.replaceChars [ "." ] [ "" ] version; src = fetchurl { - url = "https://terraria.org/system/dedicated_servers/archives/000/000/042/original/terraria-server-${urlVersion}.zip"; - sha256 = "18hcy7jfizyyp0h66rga8z948xg3nyk32rzl7hgv7ar1w43airhh"; + url = "https://terraria.org/system/dedicated_servers/archives/000/000/045/original/terraria-server-${urlVersion}.zip"; + sha256 = "0jz79yidnri6hrqp2aqbi8hg0w3k4nrnfbvxgy5q612fr04g6nsw"; }; buildInputs = [ file ]; From d4a64aa24f7f907700bfe66fc63108d69c2549ae Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 May 2021 01:53:39 +0200 Subject: [PATCH 08/37] home-assistant: 2021.5.3 -> 2021.5.4 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 844ea8976d7..e97bbae7f74 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.5.3"; + version = "2021.5.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 7616dc0ee87..e19919bf4f8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -114,7 +114,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.5.3"; + hassVersion = "2021.5.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -133,7 +133,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1zc21d70n24sk8y42xq3gzisj44kn6w6fhgqrcani470hhph24ba"; + sha256 = "1jxbxzhcnvxf6qkik2qmpdml41q6hlkazjqaxygyw7pyj094fp8v"; }; # leave this in, so users don't have to constantly update their downstream patch handling From ca8e76267df9c65080a6aa31bacc5c2fb66ec0a6 Mon Sep 17 00:00:00 2001 From: "Hedtke, Moritz" Date: Fri, 14 May 2021 14:12:30 +0200 Subject: [PATCH 09/37] discord-canary: 0.0.119 -> 0.0.121 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index fe75418ebe3..f590bffc0ea 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.119"; + version = "0.0.121"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "0bzrilag7mjfhr84l956xisbaz8mmkmqizg22f9gabgcv85vwzsi"; + sha256 = "0s85nh31wv39adawfmllp128n0wgyisbi604n0cngzi28rdw7bph"; }; }; }.${branch} From 15fb33127cc55f5a49b8d2a6b6a0906379991762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 15 May 2021 14:54:49 +0100 Subject: [PATCH 10/37] ssb-patchwork: 3.18.0 -> 3.18.1 --- pkgs/applications/networking/ssb-patchwork/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ssb-patchwork/default.nix b/pkgs/applications/networking/ssb-patchwork/default.nix index 7bc5563d470..0223c153f5c 100644 --- a/pkgs/applications/networking/ssb-patchwork/default.nix +++ b/pkgs/applications/networking/ssb-patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.18.0"; + version = "3.18.1"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "1sb9q1qj5mj4cf8d9dsc498mg8a1ri2y0p9qbh44i8ykby8jkgjc"; + sha256 = "F8n6LLbgkg3z55lSY60T+pn2lra8aPt6Ztepw1gf2rI="; }; binary = appimageTools.wrapType2 { @@ -47,7 +47,7 @@ in ''; homepage = "https://www.scuttlebutt.nz/"; license = licenses.agpl3; - maintainers = with maintainers; [ asymmetric ninjatrappeur ]; + maintainers = with maintainers; [ asymmetric ninjatrappeur cyplo ]; platforms = [ "x86_64-linux" ]; }; } From bdabf32fdd0e9f8102d9c22fa20dde45054a6081 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 15 May 2021 16:56:35 +0200 Subject: [PATCH 11/37] home-assistant: print full variables on test error --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e19919bf4f8..d3aa10620b8 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -425,6 +425,8 @@ in with py.pkgs; buildPythonApplication rec { "--only-rerun RuntimeError" # assign tests grouped by file to workers "--dist loadfile" + # enable full variable printing on error + "--showlocals" # tests are located in tests/ "tests" # screenlogic/test_config_flow.py: Tries to send out UDP broadcasts From 541a034ecf3d80482bb6036abaea638b07c2dc06 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Sat, 15 May 2021 21:19:52 +0530 Subject: [PATCH 12/37] xplr: 0.8.4 -> 0.9.1 --- pkgs/applications/misc/xplr/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index f32aa8456e2..8c6994b0303 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -1,19 +1,17 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchCrate, libiconv }: rustPlatform.buildRustPackage rec { pname = "xplr"; - version = "0.8.4"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "sayanarijit"; - repo = pname; - rev = "v${version}"; - sha256 = "00kmmdwwf9cll25bkszgin2021ggf9b28jlcpicin5kgw4iwlhkj"; + src = fetchCrate { + inherit pname version; + sha256 = "0ca6r0xkcdg1ha0n79kzxqh2ks5q3l3hgylqqy62vk51c6yrjx9x"; }; buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoSha256 = "1j43vwb885h355wdmjijz1qpkqn1dmb93hwi6vc035vkbbxs1g4r"; + cargoSha256 = "1c29dakcff130fvavgq2kpy2ncpgxkil2mi14q2m9jpsrvhqcdvk"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 878eec12e53e69de3ba639f344deada28baf386b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sat, 15 May 2021 18:05:54 -0300 Subject: [PATCH 13/37] theme-jade1: 1.12 -> 1.13 --- pkgs/data/themes/jade1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index 6eea90c7119..f33fa2db546 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.12"; + version = "1.13"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8"; + sha256 = "04a9c56w4hm8lwa8hzy5lwj4yli19gzy5wp5iinsm61qas9xgy69"; }; sourceRoot = "."; From db8a884d4b7948ee2b03db702722d8b2879f592b Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Fri, 7 May 2021 21:57:49 +0200 Subject: [PATCH 14/37] fancy-motd: init at unstable-2021-05-15 --- pkgs/tools/system/fancy-motd/default.nix | 47 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/system/fancy-motd/default.nix diff --git a/pkgs/tools/system/fancy-motd/default.nix b/pkgs/tools/system/fancy-motd/default.nix new file mode 100644 index 00000000000..982dbcd2f5b --- /dev/null +++ b/pkgs/tools/system/fancy-motd/default.nix @@ -0,0 +1,47 @@ +{ stdenv, lib, fetchFromGitHub, bc, curl, figlet, fortune, gawk, iproute2, procps }: + +stdenv.mkDerivation rec { + pname = "fancy-motd"; + version = "unstable-2021-05-15"; + + src = fetchFromGitHub { + owner = "bcyran"; + repo = pname; + rev = "b25c1e7d76927d7f947a048d844dad4400de3598"; + sha256 = "05jazmijk3im1wl4nprkwmrq6bxhb3ah8syyqym109blajy72841"; + }; + + buildInputs = [ bc curl figlet fortune gawk iproute2 ]; + + postPatch = '' + substituteInPlace motd.sh \ + --replace 'BASE_DIR="$(dirname "$(readlink -f "$0")")"' "BASE_DIR=\"$out/lib\"" + + substituteInPlace modules/20-uptime \ + --replace "uptime -p" "${procps}/bin/uptime -p" + + # does not work on nixos + rm modules/41-updates + ''; + + installPhase = '' + runHook preInstall + + install -D motd.sh $out/bin/motd + + install -D framework.sh $out/lib/framework.sh + install -D config.sh.example $out/lib/config.sh + find modules -type f -exec install -D {} $out/lib/{} \; + + runHook postInstall + ''; + + meta = with lib; { + description = "Fancy, colorful MOTD written in bash. Server status at a glance."; + homepage = "https://github.com/bcyran/fancy-motd"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + platforms = platforms.linux; + mainProgram = "motd"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4b86795539..31c8ec6b636 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4388,6 +4388,8 @@ in fakechroot = callPackage ../tools/system/fakechroot { }; + fancy-motd = callPackage ../tools/system/fancy-motd { }; + fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; fanficfare = callPackage ../tools/text/fanficfare { }; From 4539a5b8be350016b4cc8af67aab6baba88005f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 16 May 2021 06:52:17 +0000 Subject: [PATCH 15/37] ace: 7.0.1 -> 7.0.2 --- pkgs/development/libraries/ace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index 8210bdb4425..b27cb8aae35 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ace"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "sha256-5nH5a0tBOcGfA07eeh9EjH0vgT3gTRWYHXoeO+QFQjQ="; + sha256 = "sha256-IftPSQOrZOqMLHHlUFEFa3WcvsqN5kdS5rSlGE8ETC4="; }; enableParallelBuilding = true; From 1e6a687fd0dc633a156933ad876ed1e843220f0b Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 16 May 2021 10:11:39 +0200 Subject: [PATCH 16/37] linux_lqx: 5.11.20 -> 5.11.21 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 1b9dc8efc9c..4bc5cee4444 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.20"; + version = "5.11.21"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0pdn3p9v3jasgf4xffirijlx20qp9gglzlksk2gmyzg9lmf5dygi"; + sha256 = "1klvik8nrqsqi5ijnga1li4gacsknmap75g2zp8f3hd3hz18d5n1"; }; extraMeta = { From d460acab056d8351d1a6a659f249022fc44fc565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 16 May 2021 11:06:27 +0200 Subject: [PATCH 17/37] pika-backup: 0.2.3 -> 0.3.0 https://gitlab.gnome.org/World/pika-backup/-/tags/v0.3.0 --- pkgs/applications/backup/pika-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/backup/pika-backup/default.nix b/pkgs/applications/backup/pika-backup/default.nix index f04a5a2d8bf..f64fbd15ae1 100644 --- a/pkgs/applications/backup/pika-backup/default.nix +++ b/pkgs/applications/backup/pika-backup/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.2.3"; + version = "0.3.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - sha256 = "sha256-jy22eyuzM2y7vByT3TOlAUuTKtPepkB9iiHQT1YGQ88="; + sha256 = "sha256-k9kl6cSohWx+MB/9jyVcTgpv02gsVwAk5KDSNqQrmzI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1ndcpgw18w3l5f7vv5vw8lxhgd5y1zxfarwnyfx13m7kcv8m3vyj"; + sha256 = "0r6nbffik5j82bi82cmc00b17xv9m7xn3w3sarzwfxz0h43lal8a"; }; patches = [ From 4c0441c0b14250955bf4325c7299fa7640ceb30d Mon Sep 17 00:00:00 2001 From: Matthias Devlamynck Date: Sun, 16 May 2021 11:08:32 +0200 Subject: [PATCH 18/37] plasma-applet-volumewin7mixer: v25 -> v26 --- .../misc/plasma-applet-volumewin7mixer/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix index bb365ecfefd..e8bc572e284 100644 --- a/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix +++ b/pkgs/applications/misc/plasma-applet-volumewin7mixer/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation rec { pname = "plasma-applet-volumewin7mixer"; - version = "25"; + version = "26"; src = fetchFromGitHub { owner = "Zren"; repo = "plasma-applet-volumewin7mixer"; rev = "v${version}"; - sha256 = "1nvz0a06qb3pfk8dfh5n5vgf3psd6k0j3vms9pskr511qsxw0dfi"; + sha256 = "sha256-VMOUNtAURTHDuJBOGz2N0+3VzxBmVNC1O8dVuyUZAa4="; }; + # Adds the CMakeLists.txt not provided by upstream patches = [ ./cmake.patch ]; - postPatch = "rm build "; + postPatch = "rm build"; nativeBuildInputs = [ cmake extra-cmake-modules ]; buildInputs = [ plasma-framework kwindowsystem plasma-pa ]; From cf1db5812d09ca681eb51423315eae1a587908c9 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 17 May 2021 02:57:46 +0800 Subject: [PATCH 19/37] osu-lazer: 2021.502.0 -> 2021.515.0 --- pkgs/games/osu-lazer/default.nix | 4 +- pkgs/games/osu-lazer/deps.nix | 247 +++++++++++++++---------------- 2 files changed, 118 insertions(+), 133 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 7dd9235b69d..827eb89eba9 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2021.502.0"; + version = "2021.515.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "IOneihYQry0pRXYaxZuVLIj2Ydei//khvpqwiJoakZ8="; + sha256 = "c2+Ybb9wMb9FSTxprJPLKGEv2q6y0jcMA4kEN2r7yyA="; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 9c839ec376e..170a0497adf 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -26,8 +26,8 @@ }) (fetchNuGet { name = "Humanizer"; - version = "2.9.9"; - sha256 = "07ql79qz4m7cdr6g0f0dxjywrv70xzpzz45gch73x1ad4vwc5n4m"; + version = "2.8.26"; + sha256 = "11kddzyzqpq9gkz0hmrblq494nh86va6wxx6z89xi6w1f4vj15ak"; }) (fetchNuGet { name = "Humanizer.Core"; @@ -36,243 +36,228 @@ }) (fetchNuGet { name = "Humanizer.Core"; - version = "2.9.9"; - sha256 = "05sn5l0qg5bi8qxqxlch88zlk79z9pbh6jwln7b3yxnp4hkj4kvm"; + version = "2.8.26"; + sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { name = "Humanizer.Core.af"; - version = "2.9.9"; - sha256 = "0l51ll73gjjarpyknj81v8f64mg0f0zlc7q3sgcz4fkmj6n0wxb3"; + version = "2.8.26"; + sha256 = "0znrq4frlkq1qi20301hlzxa6mdc275fa1i1a1i8ldgk9cjq94k9"; }) (fetchNuGet { name = "Humanizer.Core.ar"; - version = "2.9.9"; - sha256 = "1akrcrxl01phzp1cyhknwcmghhmr808dzv9aj8vzjmyq67p8mnja"; + version = "2.8.26"; + sha256 = "1hi7mln48p1nmxlgdq725s4cvla9nlkvbmrsql1rfjjlsy8hn6n7"; }) (fetchNuGet { name = "Humanizer.Core.az"; - version = "2.9.9"; - sha256 = "0jsxjvhmgwngx5b1yki5g6ns7yhzn3m5invzlnl79dh09krx9pg4"; + version = "2.8.26"; + sha256 = "0av7ycrqwvmikqia3z3qkp9967zilrhayny17zkm0d0mnjq62vs6"; }) (fetchNuGet { name = "Humanizer.Core.bg"; - version = "2.9.9"; - sha256 = "0l32vi52qkvx267qnykid5965199h6rcy5r04gmkv3lg2ydds0ig"; + version = "2.8.26"; + sha256 = "13j6zk2cmk7a119azxlpjhfwykrzk0vkf5a799fb2fzkvhnj4hkg"; }) (fetchNuGet { name = "Humanizer.Core.bn-BD"; - version = "2.9.9"; - sha256 = "1yivbxcxh15jgy8j5fzrd40c9k75wmcd9wdy1333zwcyrwqzpx7v"; + version = "2.8.26"; + sha256 = "0h619sksggfi7dnaycz6bj9aiqdgn0d8dpgjgdl73crw52lr70p9"; }) (fetchNuGet { name = "Humanizer.Core.cs"; - version = "2.9.9"; - sha256 = "05ysribnj8b2q2fcm33lcgz7mcdgx5q53w6vihyjc5s6zmlfqqfr"; + version = "2.8.26"; + sha256 = "11bh3k15388bi5wizaihnwqk7wb4n7q636fqjllwdhjggqrsc3f6"; }) (fetchNuGet { name = "Humanizer.Core.da"; - version = "2.9.9"; - sha256 = "0d6swwliw0cbb03vjv2i1n8vcclwzragi1ik3m6ysbwm1m0sip5v"; + version = "2.8.26"; + sha256 = "09b3x3bw3cgby9qvaccnqz2y6d8gl3497dh7q0dk1iznsxbk4x4m"; }) (fetchNuGet { name = "Humanizer.Core.de"; - version = "2.9.9"; - sha256 = "085ijfkbz4q6q90z0qc4k5hsv2acdlhli8whiikil9mlrjsjrqhi"; + version = "2.8.26"; + sha256 = "1pyp2a9my20wlwjjzv563kshl9fpjb2kd4cw41l4wvsz1bsq3l22"; }) (fetchNuGet { name = "Humanizer.Core.el"; - version = "2.9.9"; - sha256 = "1f5fr6l8f4brva1jxx6migv9yhp98svwkzly1b2b6n43ngppn4jd"; + version = "2.8.26"; + sha256 = "0v3sdcxca4dam1y5yjh9n6v711ys0zdv38hr4kij35s6277ls6lb"; }) (fetchNuGet { name = "Humanizer.Core.es"; - version = "2.9.9"; - sha256 = "0nwwxhp2wgq424fy2mjrgsjsm86y818zl64k6zibkcnfldm8als6"; + version = "2.8.26"; + sha256 = "0wh9qvqf80cngwsz2jnrsjpmaax4xa2xp8bbk5xs480kp071z37q"; }) (fetchNuGet { name = "Humanizer.Core.fa"; - version = "2.9.9"; - sha256 = "1268lf9lxxnnax0ivyghh707fy50z09qds2jlh53dw1q0lxqgp50"; + version = "2.8.26"; + sha256 = "00v56ddjfv6sr6w5246gn5z0padwswvnngp8mdl7gjfg5ycmbkl1"; }) (fetchNuGet { name = "Humanizer.Core.fi-FI"; - version = "2.9.9"; - sha256 = "1cjs78z1lc7a42b1wvcpxpydyv65rvyfvfic8k0d2flwcv98i7z2"; + version = "2.8.26"; + sha256 = "1pgs0j5ri50a6vhljplhrlc8jj1hrd9ggxkj60d9v5kk9xibzzyd"; }) (fetchNuGet { name = "Humanizer.Core.fr"; - version = "2.9.9"; - sha256 = "1al0xbg6p0287v60a4s6k7vgsng6k4m0scwlshmqsqxmvfsa1wk3"; + version = "2.8.26"; + sha256 = "0kkhgy3yn8vfqlx3dhb9m3cazkgfxarknam4macng9y17l7wj83m"; }) (fetchNuGet { name = "Humanizer.Core.fr-BE"; - version = "2.9.9"; - sha256 = "0jvi063lsrzds52zvq4w4qx6khkjcn5k8mp4014pzlphfhvlfbcl"; + version = "2.8.26"; + sha256 = "13spcx07hph366qk073pz63s56nadaac7l4mr4a66gbpqd3814kb"; }) (fetchNuGet { name = "Humanizer.Core.he"; - version = "2.9.9"; - sha256 = "1azymmsf79dyl8ihx8kn19mymx98sjknaqrqf043fy8qwirll1wm"; + version = "2.8.26"; + sha256 = "1ccn82aj3rhrhsa3kvkrmjw0p687icxlfja8ngbh7sby4cszx9bk"; }) (fetchNuGet { name = "Humanizer.Core.hr"; - version = "2.9.9"; - sha256 = "1ygi02nxssn1wrdzammr5km7ak5h8yxghfvbcmy559npg0gy2gya"; + version = "2.8.26"; + sha256 = "12ii79bhai3kv7zr3k9k9dh569r6p3m4l4gj25cln2isr4wdi5r9"; }) (fetchNuGet { name = "Humanizer.Core.hu"; - version = "2.9.9"; - sha256 = "0nimza5dngvl6yyigavr1rk5068yf2fmq3w3nm128plbnc8ynxfr"; + version = "2.8.26"; + sha256 = "0cibbdxiqhwrjmxlr805mg3l9v0fl2ydx4m50608rkysjq6vxx7y"; }) (fetchNuGet { name = "Humanizer.Core.hy"; - version = "2.9.9"; - sha256 = "0v11hfh39mzm27dshmakhdnbpgzg660mskn1pkmmfdprka970cfj"; + version = "2.8.26"; + sha256 = "15aikm04f74abm4ak8rvnnkrlcz155gibn1y81pbgsyn7yrh84v3"; }) (fetchNuGet { name = "Humanizer.Core.id"; - version = "2.9.9"; - sha256 = "012bhisp75s4wv37ra692bfsvibnqgbfyipb2hw0743dqcy2mah2"; + version = "2.8.26"; + sha256 = "1i9gpzdfhmbvrqg858kqz5461sp3sh60g16dmcmyi1ik0qlspijn"; }) (fetchNuGet { name = "Humanizer.Core.it"; - version = "2.9.9"; - sha256 = "1jj7qbia4b09hsyll524mpz67vy4z25zazwc1g10yi1sjsyah92f"; + version = "2.8.26"; + sha256 = "01j7qskmqcxsakbx3bkxcjyzrh6nxi2v6kfzsfb0vf980qqq331l"; }) (fetchNuGet { name = "Humanizer.Core.ja"; - version = "2.9.9"; - sha256 = "1wqxw815287jlg6a6x3ffjhxvpa5al94jh3qkai2rw5kggcqzws4"; - }) - (fetchNuGet { - name = "Humanizer.Core.ko-KR"; - version = "2.9.9"; - sha256 = "1azggn1i8gnvc89kh7mv165bd2c7fwp1m1h9k6fcdk36kl4xxb97"; - }) - (fetchNuGet { - name = "Humanizer.Core.ku"; - version = "2.9.9"; - sha256 = "1qpwancwa6hgafrcdpbdb00vq08hrk77wjl64dvcjsx010n4c0fc"; + version = "2.8.26"; + sha256 = "07d19ns4a4pa2k4vdc1af7wj10gaflq1ny4mx6y574afkdi8v6d5"; }) (fetchNuGet { name = "Humanizer.Core.lv"; - version = "2.9.9"; - sha256 = "1k6gxlzkpfmp8khn0dl0bfw878qpdff6zjqbirgpvlc57d00bws4"; + version = "2.8.26"; + sha256 = "1pm64sj65nmngyfa3hjcw67icfmlzr232hmgpnw7306sb7dxmnfv"; }) (fetchNuGet { name = "Humanizer.Core.ms-MY"; - version = "2.9.9"; - sha256 = "0p0lc3qkq5f8354g77xgy8qc9wyc509rca8xrzgc2lpzbvb4v008"; + version = "2.8.26"; + sha256 = "1yx4cc023kc4k14abk2ycmjy6y2xaknaz4zria7xsadf0fabd1jc"; }) (fetchNuGet { name = "Humanizer.Core.mt"; - version = "2.9.9"; - sha256 = "0qn2c583lbc5qg0i1inqjb7zn8vcmvmjy8k70ngb6qyl1navmvcm"; + version = "2.8.26"; + sha256 = "0iai35pzka9g6c3sgswki06fk6gdnq8kc88wyb4pcciivazz31px"; }) (fetchNuGet { name = "Humanizer.Core.nb"; - version = "2.9.9"; - sha256 = "12b7dx6jp5fcwsn54i7w1qz8y3cwbl8n8hia75iy9acd9l328shk"; + version = "2.8.26"; + sha256 = "0xprhiyjyq6mpha2lrav59n1f48508ddvm9nmdk5sm5k26ff3l90"; }) (fetchNuGet { name = "Humanizer.Core.nb-NO"; - version = "2.9.9"; - sha256 = "04f47z9klpj6dq1gqlbcgyrli2s3rjci75i8lrng63vjjqi7jpqh"; + version = "2.8.26"; + sha256 = "160c98wfh7d2xlvlra4x5rdj4klgcjwcy3gkb4ipg655byn2m1j2"; }) (fetchNuGet { name = "Humanizer.Core.nl"; - version = "2.9.9"; - sha256 = "19l4ik73500k2nxpcpylawy1aimb0awd82521abry3az4kc1lf29"; + version = "2.8.26"; + sha256 = "067pqm4i1mk83fqqr0bvzrchrvxwdnff18z3djgagclh1i4xqlvk"; }) (fetchNuGet { name = "Humanizer.Core.pl"; - version = "2.9.9"; - sha256 = "0hdh6gvz00xbrfyypwlbaw14409p75wqxraih2ckw23g8ci404l3"; + version = "2.8.26"; + sha256 = "1r1bbqb990war1hiag5f88yxw0k9jiid1ihb4s5bc1lzs3vfsb6x"; }) (fetchNuGet { name = "Humanizer.Core.pt"; - version = "2.9.9"; - sha256 = "03xplyqms9hpkl2bzhnqij3il78adi8a4azrs658rslpl8fl7ksd"; + version = "2.8.26"; + sha256 = "1bik0vjjdzw51yl11ng9gsi3ihz50ibwh1gdhh2vd13jxjzb512p"; }) (fetchNuGet { name = "Humanizer.Core.ro"; - version = "2.9.9"; - sha256 = "0x8qjkp8w32bhwr6509zpxlkvxb9izkgzq411hmh2sx4hrr90pzc"; + version = "2.8.26"; + sha256 = "12f2hry6x1p1mgx6g4kpig2jpybx52ibghvhdhjbbfhy32gv8dr0"; }) (fetchNuGet { name = "Humanizer.Core.ru"; - version = "2.9.9"; - sha256 = "0s2f9wxqwy281zw7aiswvfk8dg0i278g4z2l3bqn9iyijqm47zxx"; + version = "2.8.26"; + sha256 = "1hri12kwymzvdqcr66l8yiqiw3pmf9fk492z10yqljm576kyshgg"; }) (fetchNuGet { name = "Humanizer.Core.sk"; - version = "2.9.9"; - sha256 = "0nq27nx6xq81d5avriphm7s926xm34306v7l7c88n71kn097jzl9"; + version = "2.8.26"; + sha256 = "07jfgk67axw97b85dn4bwpjwf3swd74j9hdd870qps12xfp98i9j"; }) (fetchNuGet { name = "Humanizer.Core.sl"; - version = "2.9.9"; - sha256 = "0dwszkm2xd4ysh3rrjx1zran09hl532hjrppfckqyy6n65b4axyf"; + version = "2.8.26"; + sha256 = "060xbzwb7p9ypbqfklih2zal2rh6h55gq4hv3i6alvlbd3vsx29n"; }) (fetchNuGet { name = "Humanizer.Core.sr"; - version = "2.9.9"; - sha256 = "1vmfs9jp8ljlh6965pmb4afbcc9c4zlg5dn1pgbjc4miiwj6vc73"; + version = "2.8.26"; + sha256 = "0i2c24qmqnhp85b088qlbagxd48hcl0v1ly4m7hfbvx5s7fg8riv"; }) (fetchNuGet { name = "Humanizer.Core.sr-Latn"; - version = "2.9.9"; - sha256 = "1dakb2zcaxmm9qw8fnsz5z12mmbjgx7jm9plxbm7jidjn7z271yl"; + version = "2.8.26"; + sha256 = "1911a69sqssh9f007vmxbgyj4ym2ym4423xvw6cmbfhjcrhkfpbi"; }) (fetchNuGet { name = "Humanizer.Core.sv"; - version = "2.9.9"; - sha256 = "0jys46lz25yxx70w7y2623iabv3clf3lix8jzl8r68rj0lw6pxdz"; - }) - (fetchNuGet { - name = "Humanizer.Core.th-TH"; - version = "2.9.9"; - sha256 = "0r37ckvh68xvlyszgx94a8xxmya5cqiqnvdg5syw04lj0rshc3jb"; + version = "2.8.26"; + sha256 = "056h8n9i18yl78f9ppzn2kkrz2cs46aqv0j5y8xq360zarggh0nm"; }) (fetchNuGet { name = "Humanizer.Core.tr"; - version = "2.9.9"; - sha256 = "1dnba6wbf6r5a1gmf7a7136qhy1w8izbh6wimmmwqsch2sk4ng4f"; + version = "2.8.26"; + sha256 = "0dk8ga3fpxifxxkz0n68654h65cvrx00hy7q00m5vgvmcp70gxxn"; }) (fetchNuGet { name = "Humanizer.Core.uk"; - version = "2.9.9"; - sha256 = "1z0kdp2qkiyb4dhy22rqfik2b2c899nzkfh10907gp9827rdz3b9"; + version = "2.8.26"; + sha256 = "0bnj5xqlcqp4n8i04ra78dax4854zbf2jsygvb4lpiayyyaj2bxw"; }) (fetchNuGet { name = "Humanizer.Core.uz-Cyrl-UZ"; - version = "2.9.9"; - sha256 = "1rnqa7w8s44fnqpw4g2drcwyajd5zhmwkqipi5zfhh0bcdnj9hxx"; + version = "2.8.26"; + sha256 = "1bbf6mxas6brjw7rjljq5saz6v3ic6zbvm1b3c1jbk0hc0qkd7c8"; }) (fetchNuGet { name = "Humanizer.Core.uz-Latn-UZ"; - version = "2.9.9"; - sha256 = "1i1c6dy4bdglgyhv8g13lwqlis1snl7zcpdrvidw40f74ch0zq0g"; + version = "2.8.26"; + sha256 = "1bfgfihpynax30g9kq8kra7c4jxps2ccxsxrs9gls47xbs35cw2f"; }) (fetchNuGet { name = "Humanizer.Core.vi"; - version = "2.9.9"; - sha256 = "0ji0lmcm073x9fyigrw3b500drz268jarv6vfxpwxbzxd3mvnrys"; + version = "2.8.26"; + sha256 = "1vm765nvkp6wyfwlcgppimjrk04lkg8lscch3n1i1i5hlqxrs9ch"; }) (fetchNuGet { name = "Humanizer.Core.zh-CN"; - version = "2.9.9"; - sha256 = "10iyrahi7rdp8lq4rxb2k9pny7da2aw9xfy2la8jdjrjgmqwffsi"; + version = "2.8.26"; + sha256 = "1qyl12rdh4iv1k1qcivcmxxnh8y93ainf22pmch8vvw9yjhs1y7s"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hans"; - version = "2.9.9"; - sha256 = "0f92fvzgcifaf2b64x8v52xckp1qxg88djlb9vlj083f6x29ick5"; + version = "2.8.26"; + sha256 = "1gqv3dyk236wlp5wb7kd4qnyrmp3cy36ycykl7zr91s25cdls5vy"; }) (fetchNuGet { name = "Humanizer.Core.zh-Hant"; - version = "2.9.9"; - sha256 = "0v9vqn6h467q7fy3xwabnqw48p48ilwkfg62b65j0q76ppnvsnvj"; + version = "2.8.26"; + sha256 = "1rhzbiqbx04l3kvzjklix90fxyc6vvmmw0p564ajdiximivs0pbh"; }) (fetchNuGet { name = "JetBrains.Annotations"; @@ -446,8 +431,8 @@ }) (fetchNuGet { name = "Microsoft.Diagnostics.Runtime"; - version = "2.0.217201"; - sha256 = "1r519zbbq13f76kc657wml735h9lcijkyxw6r96akn7cv9vgiwl6"; + version = "2.0.222201"; + sha256 = "1vsa6xbqi4f2mx85rjmq641r9zgssj0bbfcsqlsa5nx6lqh2rf2q"; }) (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; @@ -686,48 +671,48 @@ }) (fetchNuGet { name = "NuGet.Common"; - version = "5.9.0"; - sha256 = "1j0kk8rgssw920r7h8zfqwzsgvh3y5lalz19d5r07l9r9ngcj5w9"; + version = "5.9.1"; + sha256 = "0d919d15r6fzixfxz56xnayfbw9lfvpr99k7k2wlyh228l58xlng"; }) (fetchNuGet { name = "NuGet.Configuration"; - version = "5.9.0"; - sha256 = "16wqjflqvhgq5nqa7ips63hv6wd39171q337gk5wkr9ffpwarrx9"; + version = "5.9.1"; + sha256 = "13v3jmirwil1w74wwsspm31rzppb7fbnh99sfig6hrqxhxyzhgnc"; }) (fetchNuGet { name = "NuGet.DependencyResolver.Core"; - version = "5.9.0"; - sha256 = "1f1rcvl86qvix3hibm7xm5wzvwah5pc4ik9mnrgavnwixwkix9nz"; + version = "5.9.1"; + sha256 = "0bdmz886bmdgndy7101mq08idzwp8y73hf4l9az3jdndd6cia1ic"; }) (fetchNuGet { name = "NuGet.Frameworks"; - version = "5.9.0"; - sha256 = "099kb0mvglhfv5b0r1ddnkl6mm8l2x5kpmm1kqs5qkchk0a1y0ci"; + version = "5.9.1"; + sha256 = "12fjigazzlmh63479hralrfgdcqxq6qsdr57b9zj0ipwqj0s6l3i"; }) (fetchNuGet { name = "NuGet.LibraryModel"; - version = "5.9.0"; - sha256 = "1m6ym5dld0drpk7lm0i0ss30292rpk80b701n1nakqykfnkfhhfy"; + version = "5.9.1"; + sha256 = "1z1m6ik1sxsr129578dy22wspci4xavwjza0f08nm1vbb4v3y4va"; }) (fetchNuGet { name = "NuGet.Packaging"; - version = "5.9.0"; - sha256 = "0m0sn823v0lb4h2maxcndvj2k1a0iwwl1yndbhna2ir2lq2fi4px"; + version = "5.9.1"; + sha256 = "0yknzgwmpkcddba3b2d1kq9yizxxdd08xcxv508brr2079g01q6d"; }) (fetchNuGet { name = "NuGet.ProjectModel"; - version = "5.9.0"; - sha256 = "06qdfhxz5bsq2wx7i9dkc2rsr4bkk02mpyq27v6zrz36vyrckwx3"; + version = "5.9.1"; + sha256 = "0g3gxh0g6lcaczk9jczzkpmikxhdivfflpqw40jygs64r5837rbv"; }) (fetchNuGet { name = "NuGet.Protocol"; - version = "5.9.0"; - sha256 = "1nvfg1xxpjqbpdmw1xa6m7sbdp19ld442vqh3x4967z6c92wvc4n"; + version = "5.9.1"; + sha256 = "1wz7rv262wb42s1y866w9bcvpl22dr4s915dsky8sbc69y5646wn"; }) (fetchNuGet { name = "NuGet.Versioning"; - version = "5.9.0"; - sha256 = "1rby89nx39l533vhk0ikf16dd1d6kjjn4ld8b0y88g2mlnrdgz4m"; + version = "5.9.1"; + sha256 = "0vpswa6gz36z2vqwvbylmh7r9hjhlib91vbvkf0icjfkhzijjq08"; }) (fetchNuGet { name = "NUnit"; @@ -746,8 +731,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2021.427.0"; - sha256 = "18n9g21y7asgr51fskfk3m0sx07y1mwrsdq4s065i8yk8d412mh7"; + version = "2021.513.0"; + sha256 = "17cqmgfd40jbdkm5rq9wl1rcvv870yqryc29k4c8bdsvxxf4arv2"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -766,8 +751,8 @@ }) (fetchNuGet { name = "ppy.SDL2-CS"; - version = "1.0.225-alpha"; - sha256 = "1x8hvk9kikwi7wrvwxdxk3pkbs491iss2mvqgiw844zld5izihqc"; + version = "1.0.238-alpha"; + sha256 = "1n7pa7gy1hcgsfm3jix334qr6v229n1yymq58njj802l3k5g7980"; }) (fetchNuGet { name = "ppy.squirrel.windows"; From 7bd65d54f772589bf321e25b605166bf626cc131 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 14 May 2021 16:00:41 +0200 Subject: [PATCH 20/37] treewide: remove nand0p as maintainer While looking at the sphinx package I noticed it was heavily undermaintained, which is when we noticed nand0p has been inactive for roughly 18 months. It is therefore prudent to assume they will not be maintaining their packages, modules and tests. - Their last contribution to nixpkgs was in 2019/12 - On 2021/05/08 I wrote them an email to the address listed in the maintainer-list, which they didn't reply to. --- maintainers/maintainer-list.nix | 6 ------ .../services/continuous-integration/buildbot/master.nix | 2 +- .../services/continuous-integration/buildbot/worker.nix | 2 +- nixos/modules/services/security/hologram-agent.nix | 2 +- nixos/tests/buildbot.nix | 2 +- pkgs/development/libraries/ethash/default.nix | 2 +- pkgs/development/libraries/jsoncpp/default.nix | 2 +- pkgs/development/python-modules/astroid/1.6.nix | 2 +- pkgs/development/python-modules/astroid/default.nix | 2 +- pkgs/development/python-modules/autobahn/default.nix | 2 +- pkgs/development/python-modules/buildbot/default.nix | 2 +- pkgs/development/python-modules/buildbot/pkg.nix | 2 +- pkgs/development/python-modules/buildbot/plugins.nix | 8 ++++---- pkgs/development/python-modules/buildbot/worker.nix | 2 +- pkgs/development/python-modules/distro/default.nix | 2 +- pkgs/development/python-modules/execnet/default.nix | 2 +- pkgs/development/python-modules/incremental/default.nix | 2 +- pkgs/development/python-modules/isort/4.nix | 2 +- pkgs/development/python-modules/isort/default.nix | 2 +- pkgs/development/python-modules/jsonref/default.nix | 2 +- pkgs/development/python-modules/pylint/1.9.nix | 2 +- pkgs/development/python-modules/pylint/default.nix | 2 +- pkgs/development/python-modules/pytest-mock/2.nix | 2 +- pkgs/development/python-modules/pytest-mock/default.nix | 2 +- .../python-modules/pytest-server-fixtures/default.nix | 2 +- pkgs/development/python-modules/ramlfications/default.nix | 2 +- .../python-modules/setuptoolstrial/default.nix | 2 +- pkgs/development/python-modules/sphinx-jinja/default.nix | 2 +- pkgs/development/python-modules/sphinx/2.nix | 2 +- pkgs/development/python-modules/sphinx/default.nix | 2 +- .../python-modules/sphinxcontrib-blockdiag/default.nix | 2 +- .../python-modules/sphinxcontrib-spelling/default.nix | 2 +- pkgs/development/python-modules/treq/default.nix | 2 +- pkgs/development/python-modules/txaio/default.nix | 2 +- pkgs/development/python-modules/txgithub/default.nix | 2 +- pkgs/development/python-modules/txrequests/default.nix | 2 +- pkgs/development/python-modules/whoosh/default.nix | 2 +- pkgs/development/tools/misc/cli11/default.nix | 2 +- pkgs/games/opendune/default.nix | 2 +- pkgs/misc/screensavers/electricsheep/default.nix | 2 +- pkgs/tools/graphics/flam3/default.nix | 2 +- pkgs/tools/graphics/glee/default.nix | 2 +- pkgs/tools/misc/ethminer/default.nix | 2 +- pkgs/tools/networking/httperf/default.nix | 2 +- pkgs/tools/security/hologram/default.nix | 2 +- 45 files changed, 47 insertions(+), 53 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 08758631a17..c321e4fed72 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7019,12 +7019,6 @@ githubId = 1222539; name = "Roman Naumann"; }; - nand0p = { - email = "nando@hex7.com"; - github = "nand0p"; - githubId = 1916245; - name = "Fernando Jose Pando"; - }; nasirhm = { email = "nasirhussainm14@gmail.com"; github = "nasirhm"; diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index a49f5f8100d..f668e69e5df 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -283,5 +283,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ]; + meta.maintainers = with lib.maintainers; [ mic92 lopsided98 ]; } diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix index 7b8a35f54bf..708b3e1cc18 100644 --- a/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -191,6 +191,6 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ nand0p ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index e37334b3cf5..e29267e5000 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -54,5 +54,5 @@ in { }; - meta.maintainers = with lib.maintainers; [ nand0p ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix index 11f9fbef635..977c728835f 100644 --- a/nixos/tests/buildbot.nix +++ b/nixos/tests/buildbot.nix @@ -109,5 +109,5 @@ import ./make-test-python.nix { bbworker.fail("nc -z bbmaster 8011") ''; - meta.maintainers = with pkgs.lib.maintainers; [ nand0p ]; + meta.maintainers = with pkgs.lib.maintainers; [ ]; } {} diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 2c9eb3ca444..dcb10b8ba08 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; platforms = platforms.unix; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 90d3f1da6e6..f41bf0f0c80 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; - maintainers = with maintainers; [ ttuegel cpages nand0p ]; + maintainers = with maintainers; [ ttuegel cpages ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index 2c763e214e8..47c7e8f6eb3 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -34,6 +34,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 77ac408076c..d6fda529d5d 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl21Plus; platforms = platforms.all; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 2585cd539d7..52def3d6ee1 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -73,6 +73,6 @@ buildPythonPackage rec { description = "WebSocket and WAMP in Python for Twisted and asyncio"; homepage = "https://crossbar.io/autobahn"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index a42f586aadb..043a1cd3e13 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -101,7 +101,7 @@ let meta = with lib; { homepage = "https://buildbot.net/"; description = "An open-source continuous integration framework for automating software build, test, and release processes"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/pkg.nix b/pkgs/development/python-modules/buildbot/pkg.nix index d0ba54d27f7..b00a2ece568 100644 --- a/pkgs/development/python-modules/buildbot/pkg.nix +++ b/pkgs/development/python-modules/buildbot/pkg.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Packaging Helper"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/buildbot/plugins.nix b/pkgs/development/python-modules/buildbot/plugins.nix index 966f267d458..62f32a00fb4 100644 --- a/pkgs/development/python-modules/buildbot/plugins.nix +++ b/pkgs/development/python-modules/buildbot/plugins.nix @@ -23,7 +23,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot UI"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -45,7 +45,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Console View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -67,7 +67,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Waterfall View Plugin"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }; @@ -89,7 +89,7 @@ meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Grid View Plugin"; - maintainers = with maintainers; [ nand0p lopsided98 ]; + maintainers = with maintainers; [ lopsided98 ]; license = licenses.gpl2; }; }; diff --git a/pkgs/development/python-modules/buildbot/worker.nix b/pkgs/development/python-modules/buildbot/worker.nix index 334737a9055..4313d16d0b7 100644 --- a/pkgs/development/python-modules/buildbot/worker.nix +++ b/pkgs/development/python-modules/buildbot/worker.nix @@ -26,7 +26,7 @@ buildPythonPackage (rec { meta = with lib; { homepage = "https://buildbot.net/"; description = "Buildbot Worker Daemon"; - maintainers = with maintainers; [ nand0p ryansydnor lopsided98 ]; + maintainers = with maintainers; [ ryansydnor lopsided98 ]; license = licenses.gpl2; }; }) diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index 16d26e741aa..885538de65c 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/execnet/default.nix b/pkgs/development/python-modules/execnet/default.nix index b66c8a28128..57a4af2fc0c 100644 --- a/pkgs/development/python-modules/execnet/default.nix +++ b/pkgs/development/python-modules/execnet/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { description = "Distributed Python deployment and communication"; license = licenses.mit; homepage = "https://execnet.readthedocs.io/"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 6cbed7221a8..b79ba4b7db2 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -13,6 +13,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/isort/4.nix b/pkgs/development/python-modules/isort/4.nix index b2ef4e66f36..5da9a5c6b30 100644 --- a/pkgs/development/python-modules/isort/4.nix +++ b/pkgs/development/python-modules/isort/4.nix @@ -38,6 +38,6 @@ in buildPythonPackage rec { description = "A Python utility / library to sort Python imports"; homepage = "https://github.com/timothycrosley/isort"; license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; + maintainers = with maintainers; [ couchemar ]; }; } diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index bc11697339e..1195f0f6b09 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -72,6 +72,6 @@ in buildPythonPackage rec { description = "A Python utility / library to sort Python imports"; homepage = "https://github.com/PyCQA/isort"; license = licenses.mit; - maintainers = with maintainers; [ couchemar nand0p ]; + maintainers = with maintainers; [ couchemar ]; }; } diff --git a/pkgs/development/python-modules/jsonref/default.nix b/pkgs/development/python-modules/jsonref/default.nix index 3154f63f318..2ab8ec45a70 100644 --- a/pkgs/development/python-modules/jsonref/default.nix +++ b/pkgs/development/python-modules/jsonref/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { description = "An implementation of JSON Reference for Python"; homepage = "https://github.com/gazpachoking/jsonref"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index e283cc10d16..64573a1a528 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 10935d2d888..6c2702ef3db 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -67,6 +67,6 @@ buildPythonPackage rec { homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python"; license = licenses.gpl1Plus; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-mock/2.nix b/pkgs/development/python-modules/pytest-mock/2.nix index 3764a05af05..d474d281a68 100644 --- a/pkgs/development/python-modules/pytest-mock/2.nix +++ b/pkgs/development/python-modules/pytest-mock/2.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with py.test."; homepage = "https://github.com/pytest-dev/pytest-mock"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index 3e044b4fe59..a39e2e716ea 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "Thin-wrapper around the mock package for easier use with pytest"; homepage = "https://github.com/pytest-dev/pytest-mock"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/pkgs/development/python-modules/pytest-server-fixtures/default.nix index ca3c9a37c1a..7de68cadbb1 100644 --- a/pkgs/development/python-modules/pytest-server-fixtures/default.nix +++ b/pkgs/development/python-modules/pytest-server-fixtures/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { description = "Extensible server fixures for py.test"; homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index c3ae88d1775..081a3a28571 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { description = "A Python RAML parser."; homepage = "https://ramlfications.readthedocs.org"; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/setuptoolstrial/default.nix b/pkgs/development/python-modules/setuptoolstrial/default.nix index bef492e5dbc..26b8d732be1 100644 --- a/pkgs/development/python-modules/setuptoolstrial/default.nix +++ b/pkgs/development/python-modules/setuptoolstrial/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; homepage = "https://github.com/rutsky/setuptools-trial"; license = licenses.bsd2; - maintainers = with maintainers; [ ryansydnor nand0p ]; + maintainers = with maintainers; [ ryansydnor ]; }; } diff --git a/pkgs/development/python-modules/sphinx-jinja/default.nix b/pkgs/development/python-modules/sphinx-jinja/default.nix index 060d7f14a33..6f721ad1a8f 100644 --- a/pkgs/development/python-modules/sphinx-jinja/default.nix +++ b/pkgs/development/python-modules/sphinx-jinja/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension to include jinja templates in documentation"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index 5cf2cecd97f..0424b9b4c39 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -77,6 +77,6 @@ buildPythonPackage rec { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nand0p ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 8d6567b3e91..5e31b6b19fa 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { ''; homepage = "https://www.sphinx-doc.org"; license = licenses.bsd3; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix index 956e3c033b9..97e9c7529f2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx blockdiag extension"; homepage = "https://github.com/blockdiag/sphinxcontrib-blockdiag"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index 2b5beb4df07..35b7cf38aa9 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx spelling extension"; homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index ec648281c89..8bfbd534f57 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -51,6 +51,6 @@ buildPythonPackage rec { homepage = "https://github.com/twisted/treq"; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index fa219a94513..074e7b8d509 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Utilities to support code that runs unmodified on Twisted and asyncio"; homepage = "https://github.com/crossbario/txaio"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/txgithub/default.nix b/pkgs/development/python-modules/txgithub/default.nix index 09af476e94d..45e36676498 100644 --- a/pkgs/development/python-modules/txgithub/default.nix +++ b/pkgs/development/python-modules/txgithub/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "GitHub API client implemented using Twisted."; homepage = "https://github.com/tomprince/txgithub"; license = licenses.mit; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/txrequests/default.nix b/pkgs/development/python-modules/txrequests/default.nix index be32dc4a738..cf3bee52c59 100644 --- a/pkgs/development/python-modules/txrequests/default.nix +++ b/pkgs/development/python-modules/txrequests/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { description = "Asynchronous Python HTTP for Humans."; homepage = "https://github.com/tardyp/txrequests"; license = licenses.asl20; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index d3ff703f694..e31d97a07d9 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { checking library."; homepage = "https://bitbucket.org/mchaput/whoosh"; license = licenses.bsd2; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index d62ad413e1a..dbab7c880ef 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Command line parser for C++11"; homepage = "https://github.com/CLIUtils/CLI11"; platforms = platforms.unix; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index e5ac89239a3..0c9c71e38d2 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { description = "Dune, Reinvented"; homepage = "https://github.com/OpenDUNE/OpenDUNE"; license = licenses.gpl2; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 74d9e3cffee..d1aa7d9911b 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; - maintainers = with maintainers; [ nand0p fpletz ]; + maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; license = licenses.gpl1; }; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index 2015de607d2..bd959e3227e 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cosmic recursive fractal flames"; homepage = "https://flam3.com/"; - maintainers = [ maintainers.nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index 136e805e793..aeec2ffb493 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL Easy Extension Library"; homepage = "https://sourceforge.net/p/glee/glee/"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 22278cb9a4d..3a8169c6b3d 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p atemu ]; + maintainers = with maintainers; [ atemu ]; license = licenses.gpl3Only; broken = cudaSupport; }; diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index ea567f10d48..975b050de7e 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The httperf HTTP load generator"; homepage = "https://github.com/httperf/httperf"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 9c1c896d889..ca4666d9f07 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops"; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ ]; license = licenses.asl20; }; } From ee2cf16385eee10ea27bbc2b57cadfe036027a1e Mon Sep 17 00:00:00 2001 From: "Bryan A. S" Date: Sun, 16 May 2021 21:03:39 -0300 Subject: [PATCH 21/37] ferdi: Update license to asl20 Signed-off-by: Bryan A. S --- .../networking/instant-messengers/ferdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index da3d7ebb25f..c57b58eea0d 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -11,7 +11,7 @@ mkFranzDerivation rec { meta = with lib; { description = "Combine your favorite messaging services into one application"; homepage = "https://getferdi.com/"; - license = licenses.free; + license = licenses.asl20; maintainers = [ maintainers.davidtwco ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; From 6e80cf82383951a22ef78ba1daafbce9825eb33f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 17 May 2021 02:33:18 +0200 Subject: [PATCH 22/37] meme: rename to meme-image-generator, unstable-2020-05-28 -> 1.0.1 (#120079) --- .../{meme => meme-image-generator}/default.nix | 13 +++++-------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) rename pkgs/applications/graphics/{meme => meme-image-generator}/default.nix (62%) diff --git a/pkgs/applications/graphics/meme/default.nix b/pkgs/applications/graphics/meme-image-generator/default.nix similarity index 62% rename from pkgs/applications/graphics/meme/default.nix rename to pkgs/applications/graphics/meme-image-generator/default.nix index d06ff027c5b..7418aa07c75 100644 --- a/pkgs/applications/graphics/meme/default.nix +++ b/pkgs/applications/graphics/meme-image-generator/default.nix @@ -1,24 +1,21 @@ { lib -, unstableGitUpdater , buildGoModule , fetchFromGitHub }: -buildGoModule { - pname = "meme"; - version = "unstable-2020-05-28"; +buildGoModule rec { + pname = "meme-image-generator"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nomad-software"; repo = "meme"; - rev = "33a8b7d0de6996294a0464a605dacc17b26a6b02"; - sha256 = "05h8d6pjszhr49xqg02nw94hm95kb7w1i7nw8jxi582fxxm2qbnm"; + rev = "v${version}"; + sha256 = "089r0v5az2d2njn0s3d3wd0861pcs4slg6zl0rj4cm1k5cj8yd1k"; }; vendorSha256 = null; - passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fe2b1025c48..83f14e5dd50 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -440,6 +440,7 @@ mapAliases ({ mathics = throw "mathics has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 matrique = spectral; # added 2020-01-27 mbedtls_1_3 = throw "mbedtls_1_3 is end of life, see https://tls.mbed.org/kb/how-to/upgrade-2.0"; # added 2019-12-08 + meme = meme-image-generator; # added 2021-04-21 mess = mame; # added 2019-10-30 mcgrid = throw "mcgrid has been removed from nixpkgs, as it's not compatible with rivet 3"; # added 2020-05-23 mcomix = throw "mcomix has been removed from nixpkgs, as it's unmaintained; try mcomix3 a Python 3 fork"; # added 2019-12-10, modified 2020-11-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 714d8b56c80..8249a945c1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24755,7 +24755,7 @@ in melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { }; - meme = callPackage ../applications/graphics/meme { }; + meme-image-generator = callPackage ../applications/graphics/meme-image-generator { }; meme-suite = callPackage ../applications/science/biology/meme-suite { }; From 51166f90c694785975c2b0f48a20dd35663bb1fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 01:27:06 +0200 Subject: [PATCH 23/37] nixos/nginx: add option to change proxy timeouts --- .../services/web-servers/nginx/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index d811879b7b1..1a078ea6bd5 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -154,9 +154,9 @@ let ${optionalString (cfg.recommendedProxySettings) '' proxy_redirect off; - proxy_connect_timeout 60; - proxy_send_timeout 60; - proxy_read_timeout 60; + proxy_connect_timeout ${cfg.proxyTimeout}; + proxy_send_timeout ${cfg.proxyTimeout}; + proxy_read_timeout ${cfg.proxyTimeout}; proxy_http_version 1.1; include ${recommendedProxyConfig}; ''} @@ -401,6 +401,15 @@ in "; }; + proxyTimeout = mkOption { + type = types.str; + default = "60s"; + example = "20s"; + description = " + Change the proxy related timeouts in recommendedProxySettings. + "; + }; + package = mkOption { default = pkgs.nginxStable; defaultText = "pkgs.nginxStable"; From 3ed9ed81abed7191ec6f77550778f7f8e580e187 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 14 May 2021 17:04:19 +0800 Subject: [PATCH 24/37] gerbera: 1.8.0 -> 1.8.1 --- pkgs/servers/gerbera/default.nix | 128 ++++++++++++++++++++----------- 1 file changed, 82 insertions(+), 46 deletions(-) diff --git a/pkgs/servers/gerbera/default.nix b/pkgs/servers/gerbera/default.nix index bc0bfa23d7b..35290de6b24 100644 --- a/pkgs/servers/gerbera/default.nix +++ b/pkgs/servers/gerbera/default.nix @@ -1,66 +1,102 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, pkg-config -# required -, libupnp, libuuid, pugixml, libiconv, sqlite, zlib, spdlog, fmt -# options -, enableDuktape ? true, duktape -, enableCurl ? true, curl -, enableTaglib ? true, taglib -, enableLibmagic ? true, file -, enableLibmatroska ? true, libmatroska, libebml -, enableAvcodec ? false, ffmpeg -, enableLibexif ? true, libexif -, enableExiv2 ? false, exiv2 -, enableFFmpegThumbnailer ? false, ffmpegthumbnailer -, enableInotifyTools ? true, inotify-tools +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config + # required +, fmt +, libiconv +, libupnp +, libuuid +, pugixml +, spdlog +, sqlite +, zlib + # options +, enableMysql ? false +, libmysqlclient +, enableDuktape ? true +, duktape +, enableCurl ? true +, curl +, enableTaglib ? true +, taglib +, enableLibmagic ? true +, file +, enableLibmatroska ? true +, libmatroska +, libebml +, enableAvcodec ? false +, ffmpeg +, enableLibexif ? true +, libexif +, enableExiv2 ? false +, exiv2 +, enableFFmpegThumbnailer ? false +, ffmpegthumbnailer +, enableInotifyTools ? true +, inotify-tools }: -with lib; let - optionOnOff = option: if option then "on" else "off"; -in stdenv.mkDerivation rec { + libupnp' = libupnp.overrideAttrs (super: rec { + cmakeFlags = super.cmakeFlags or [ ] ++ [ + "-Dblocking_tcp_connections=OFF" + "-Dreuseaddr=ON" + ]; + }); + + options = [ + { name = "AVCODEC"; enable = enableAvcodec; packages = [ ffmpeg ]; } + { name = "CURL"; enable = enableCurl; packages = [ curl ]; } + { name = "EXIF"; enable = enableLibexif; packages = [ libexif ]; } + { name = "EXIV2"; enable = enableExiv2; packages = [ exiv2 ]; } + { name = "FFMPEGTHUMBNAILER"; enable = enableFFmpegThumbnailer; packages = [ ffmpegthumbnailer ]; } + { name = "INOTIFY"; enable = enableInotifyTools; packages = [ inotify-tools ]; } + { name = "JS"; enable = enableDuktape; packages = [ duktape ]; } + { name = "MAGIC"; enable = enableLibmagic; packages = [ file ]; } + { name = "MATROSKA"; enable = enableLibmatroska; packages = [ libmatroska libebml ]; } + { name = "MYSQL"; enable = enableMysql; packages = [ libmysqlclient ]; } + { name = "TAGLIB"; enable = enableTaglib; packages = [ taglib ]; } + ]; + + inherit (lib) flatten optionals; + +in +stdenv.mkDerivation rec { pname = "gerbera"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { repo = "gerbera"; owner = "gerbera"; rev = "v${version}"; - sha256 = "sha256-i33pAgSOjVOoj0qGBnb8hpRMqgTCBTQmKTuZ9AkvoPg="; + sha256 = "sha256-bJIT/qQOKTy2l0wsumlGNvaGqzb2mK0hHKG0S6mEG3o="; }; + postPatch = lib.optionalString enableMysql '' + substituteInPlace cmake/FindMySQL.cmake \ + --replace /usr/include/mysql ${lib.getDev libmysqlclient}/include/mariadb \ + --replace /usr/lib/mysql ${lib.getLib libmysqlclient}/lib/mariadb + ''; + cmakeFlags = [ - "-DWITH_JS=${optionOnOff enableDuktape}" - "-DWITH_CURL=${optionOnOff enableCurl}" - "-DWITH_TAGLIB=${optionOnOff enableTaglib}" - "-DWITH_MAGIC=${optionOnOff enableLibmagic}" - "-DWITH_MATROSKA=${optionOnOff enableLibmatroska}" - "-DWITH_AVCODEC=${optionOnOff enableAvcodec}" - "-DWITH_EXIF=${optionOnOff enableLibexif}" - "-DWITH_EXIV2=${optionOnOff enableExiv2}" - "-DWITH_FFMPEGTHUMBNAILER=${optionOnOff enableFFmpegThumbnailer}" - "-DWITH_INOTIFY=${optionOnOff enableInotifyTools}" # systemd service will be generated alongside the service "-DWITH_SYSTEMD=OFF" - ]; + ] ++ map (e: "-DWITH_${e.name}=${if e.enable then "ON" else "OFF"}") options; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - libupnp libuuid pugixml libiconv sqlite zlib fmt.dev + fmt + libiconv + libupnp' + libuuid + pugixml spdlog - ] - ++ optionals enableDuktape [ duktape ] - ++ optionals enableCurl [ curl ] - ++ optionals enableTaglib [ taglib ] - ++ optionals enableLibmagic [ file ] - ++ optionals enableLibmatroska [ libmatroska libebml ] - ++ optionals enableAvcodec [ ffmpeg.dev ] - ++ optionals enableLibexif [ libexif ] - ++ optionals enableExiv2 [ exiv2 ] - ++ optionals enableInotifyTools [ inotify-tools ] - ++ optionals enableFFmpegThumbnailer [ ffmpegthumbnailer ]; - + sqlite + zlib + ] ++ flatten (builtins.catAttrs "packages" (builtins.filter (e: e.enable) options)); meta = with lib; { homepage = "https://docs.gerbera.io/"; @@ -70,8 +106,8 @@ in stdenv.mkDerivation rec { It allows to stream your digital media through your home network and consume it on all kinds of UPnP supporting devices. ''; - license = licenses.gpl2; - maintainers = [ maintainers.ardumont ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ ardumont ]; platforms = platforms.linux; }; } From fd899bd0804be2473fc29a436e5464b13b4004b4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 01:21:19 +0200 Subject: [PATCH 25/37] kodi: update git tag Kodi dropped and renamed the tag for their latest release from v19.1 to 19.1-Matrix. https://github.com/xbmc/xbmc/issues/19710 --- pkgs/applications/video/kodi/unwrapped.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 9e018215dad..ba35c24ecf5 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -45,7 +45,7 @@ let kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; - rev = "v${kodiVersion}"; + rev = "${kodiVersion}-${rel}"; sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h"; }; From 814d9bac114dfa89321954767db376d7f2ec053f Mon Sep 17 00:00:00 2001 From: David Date: Thu, 13 May 2021 12:59:12 +0200 Subject: [PATCH 26/37] erlang-ls: add erlang to buildInputs This enables patch-shebangs to find `escript` and patch the interpreter path correctly --- pkgs/development/beam-modules/erlang-ls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/beam-modules/erlang-ls/default.nix b/pkgs/development/beam-modules/erlang-ls/default.nix index 3f2ae6e7e2f..ff68af8d521 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchHex, stdenv, rebar3WithPlugins, lib }: +{ fetchFromGitHub, fetchHex, stdenv, erlang, rebar3WithPlugins, lib }: let version = "0.15.0"; owner = "erlang-ls"; @@ -7,7 +7,7 @@ let in stdenv.mkDerivation { inherit version; pname = "erlang-ls"; - buildInputs = [ (rebar3WithPlugins { }) ]; + buildInputs = [ erlang (rebar3WithPlugins { }) ]; src = fetchFromGitHub { inherit owner repo; sha256 = "1s6zk8r5plm7ajifz17mvfrnk5mzbhj7alayink9phqbmzrypnfg"; From 644fbb4b8c2d18c6873257f3bd6a968ce5918027 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Sat, 15 May 2021 08:10:16 -0500 Subject: [PATCH 27/37] vimPlugins.vim-easyescape: init at 2020-11-22 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3f39433ec68..ffa9c97a2a8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -5942,6 +5942,18 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; + vim-easyescape = buildVimPluginFrom2Nix { + pname = "vim-easyescape"; + version = "2020-11-22"; + src = fetchFromGitHub { + owner = "zhou13"; + repo = "vim-easyescape"; + rev = "fd7875f1657fd54fae85088acf289b9723d8a790"; + sha256 = "0h8kmhliicbdqhximp3d961crp6qkjjs4yciksl037ds47kzrkif"; + }; + meta.homepage = "https://github.com/zhou13/vim-easyescape/"; + }; + vim-easygit = buildVimPluginFrom2Nix { pname = "vim-easygit"; version = "2018-07-08"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c1ebd896360..940c2053018 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -779,4 +779,5 @@ yssl/QFEnter yuki-yano/ncm2-dictionary yunlingz/ci_dark zah/nim.vim +zhou13/vim-easyescape ziglang/zig.vim From 79d252d26c492e9c64258be41fe2e110fa7a7679 Mon Sep 17 00:00:00 2001 From: Devin Singh Date: Sat, 15 May 2021 08:16:21 -0500 Subject: [PATCH 28/37] vimPlugins.edge: init at 2021-05-08 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ffa9c97a2a8..0ea2c26a322 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1290,6 +1290,18 @@ final: prev: meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; + edge = buildVimPluginFrom2Nix { + pname = "edge"; + version = "2021-05-08"; + src = fetchFromGitHub { + owner = "sainnhe"; + repo = "edge"; + rev = "8f4cc117b703168f6c5d03ef65b36b095bb3f981"; + sha256 = "0rq256pwfrxpgy9w2wx4fk9jddmb0xrifhnjkdjf3cmir8xdl7mp"; + }; + meta.homepage = "https://github.com/sainnhe/edge/"; + }; + editorconfig-vim = buildVimPluginFrom2Nix { pname = "editorconfig-vim"; version = "2021-04-04"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 940c2053018..e5d6ac32839 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -556,6 +556,7 @@ rstacruz/vim-closer rust-lang/rust.vim ryanoasis/vim-devicons ryvnf/readline.vim +sainnhe/edge sainnhe/sonokai sakhnik/nvim-gdb saltstack/salt-vim From 22437644f997050b4077fe52d5bf8e41434f26e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 17 May 2021 03:41:47 +0200 Subject: [PATCH 29/37] home-assistant: disable failing test in mobile app component ____________________ test_webhook_handle_get_config[pyloop] ____________________ [gw18] linux -- Python 3.8.9 /nix/store/q6gfck5czr67090pwm53xrdyhpg6bx67-python3-3.8.9/bin/python3.8 hass = create_registrations = ({'cloudhook_url': None, 'remote_ui_url': None, 'secret': 'ed8ac650f2b5865733d2cea4ad1b6b02bcfbdcc3e527524bc1c457d5c6f...emote_ui_url': None, 'secret': None, 'webhook_id': '558fde83113d48024a427ccf004e2d2bdf7c56646c6a5a953566c272d51f1bfc'}) webhook_client = async def test_webhook_handle_get_config(hass, create_registrations, webhook_client): """Test that we can get config properly.""" resp = await webhook_client.post( "/api/webhook/{}".format(create_registrations[1]["webhook_id"]), json={"type": "get_config"}, ) assert resp.status == 200 json = await resp.json() if "components" in json: json["components"] = set(json["components"]) if "allowlist_external_dirs" in json: json["allowlist_external_dirs"] = set(json["allowlist_external_dirs"]) hass_config = hass.config.as_dict() expected_dict = { "latitude": hass_config["latitude"], "longitude": hass_config["longitude"], "elevation": hass_config["elevation"], "unit_system": hass_config["unit_system"], "location_name": hass_config["location_name"], "time_zone": hass_config["time_zone"], "components": hass_config["components"], "version": hass_config["version"], "theme_color": "#03A9F4", # Default frontend theme color } > assert expected_dict == json E AssertionError: assert {'components'...st home', ...} == {'components'...st home', ...} E Omitting 8 identical items, use -vv to show E Differing items: E {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} E Use -v to get the full diff tests/components/mobile_app/test_webhook.py:231: AssertionError --- pkgs/servers/home-assistant/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d3aa10620b8..3a8948f8982 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -457,6 +457,8 @@ in with py.pkgs; buildPythonApplication rec { "test_check_package_version_does_not_match" # homeassistant/util/thread.py:51: SystemError "test_executor_shutdown_can_interrupt_threads" + # {'theme_color': '#03A9F4'} != {'theme_color': 'blue'} + "test_webhook_handle_get_config" ]; preCheck = '' From aba7bc983f9f487ea64a5d47bd1c2a33fdf65c11 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 May 2021 19:54:36 +0700 Subject: [PATCH 30/37] openvino: move unzip to nativeBuildInputs --- 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 a083c06a334..b4e48788799 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -83,13 +83,13 @@ stdenv.mkDerivation rec { cmake autoPatchelfHook addOpenGLRunpath + unzip ]; buildInputs = [ git protobuf opencv - unzip python tbb shellcheck From 682578af423e08953f38990b6cc7a9a4cff07c71 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 May 2021 19:55:11 +0700 Subject: [PATCH 31/37] openjdk: move unzip to nativeBuildInputs --- pkgs/development/compilers/openjdk/15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index d5cf8fe06cd..6430c970936 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -22,9 +22,9 @@ let sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l"; }; - nativeBuildInputs = [ pkg-config autoconf ]; + nativeBuildInputs = [ pkg-config autoconf unzip zip file which ]; buildInputs = [ - cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib + cpio perl zlib cups freetype alsaLib libjpeg giflib libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst libXi libXinerama libXcursor libXrandr fontconfig openjdk15-bootstrap ] ++ lib.optionals (!headless && enableGnome2) [ From 75c67d6be96c5a511b78282d0ef711bc7deacf59 Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 May 2021 20:07:27 +0700 Subject: [PATCH 32/37] torchat: use fetchFromGitHub --- .../instant-messengers/torchat/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index dfc2613d3e9..4a1ffef292f 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, python, unzip, wxPython, wrapPython, tor }: -stdenv.mkDerivation rec { +{ lib, stdenv, fetchFromGitHub, python, unzip, wxPython, wrapPython, tor }: +stdenv.mkDerivation rec { pname = "torchat"; version = "0.9.9.553"; - src = fetchurl { - url = "https://github.com/prof7bit/TorChat/archive/${version}.tar.gz"; - sha256 = "0rb4lvv40pz6ab5kxq40ycvh7kh1yxn7swzgv2ff2nbhi62xnzp0"; + src = fetchFromGitHub { + owner = "prof7bit"; + repo = "TorChat"; + rev = version; + sha256 = "2LHG9qxZDo5rV6wsputdRo2Y1aHs+irMwt1ucFnXQE0="; }; nativeBuildInputs = [ unzip ]; From c5a669d3f7c9b9695f6e19f5b035a30a33576b1f Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Tue, 11 May 2021 20:07:47 +0700 Subject: [PATCH 33/37] treewide: remove unzip where not needed --- pkgs/applications/version-management/mercurial/4.9.nix | 4 ++-- pkgs/development/libraries/gdal/2.4.nix | 3 +-- pkgs/development/libraries/herqq/default.nix | 4 ++-- pkgs/development/libraries/irrlicht/default.nix | 3 +-- pkgs/development/libraries/irrlicht/mac.nix | 4 ++-- pkgs/development/libraries/mygui/default.nix | 4 ++-- pkgs/development/libraries/openexrid-unstable/default.nix | 3 +-- pkgs/development/libraries/openfx/default.nix | 4 +--- pkgs/development/libraries/openvdb/default.nix | 3 +-- .../python-modules/python-simple-hipchat/default.nix | 5 +---- pkgs/development/tools/misc/jscoverage/default.nix | 4 ++-- pkgs/misc/drivers/foo2zjs/default.nix | 3 +-- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/servers/http/jboss/default.nix | 4 +--- pkgs/tools/archivers/zpaq/default.nix | 4 ++-- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- pkgs/tools/misc/vorbisgain/default.nix | 3 +-- pkgs/top-level/dotnet-packages.nix | 3 --- 18 files changed, 25 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index d2511e27863..030a35212ec 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python2Packages, makeWrapper, unzip +{ lib, stdenv, fetchurl, python2Packages, makeWrapper , guiSupport ? false, tk ? null , ApplicationServices , mercurialSrc ? fetchurl rec { @@ -21,7 +21,7 @@ in python2Packages.buildPythonApplication { inherit python; # pass it so that the same version can be used in hg2git - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ docutils ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; diff --git a/pkgs/development/libraries/gdal/2.4.nix b/pkgs/development/libraries/gdal/2.4.nix index 70ae3b2b12a..234d986b21f 100644 --- a/pkgs/development/libraries/gdal/2.4.nix +++ b/pkgs/development/libraries/gdal/2.4.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib +{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib , postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat , libiconv, libxml2 @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite libspatialite poppler hdf4 qhull giflib expat libxml2 proj ] ++ (with python2Packages; [ python numpy wrapPython ]) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index f35d7528f4e..65eacd7fffe 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,10 +1,10 @@ -{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }: mkDerivation rec { version = "unstable-20-06-26"; pname = "herqq"; - nativeBuildInputs = [ qmake unzip ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtmultimedia ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 63310845971..260be948ce1 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }: +{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }: let common = import ./common.nix { inherit fetchzip; }; @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index 1235941b2dc..a7901466081 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: +{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }: let common = import ./common.nix { inherit fetchzip; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "-DIRRLICHT_BUILD_TOOLS=OFF" ]; - nativeBuildInputs = [ cmake unzip ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ OpenGL Cocoa IOKit ]; meta = { diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 8e63cb68120..740c1fec883 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, +{ lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid, boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } : let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w"; }; - nativeBuildInputs = [ cmake pkg-config unzip ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libX11 ois freetype libuuid boost ] ++ (if withOgre then [ ogre ] else [ libGL libGLU ]); diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index 1e3ee989644..47b2f639547 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: +{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }: stdenv.mkDerivation { pname = "openexrid-unstable"; @@ -25,7 +25,6 @@ stdenv.mkDerivation { -I${openfx.dev}/include/OpenFX ''; - nativeBuildInputs = [ unzip ]; buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openfx/default.nix b/pkgs/development/libraries/openfx/default.nix index a26e97798ae..201bf16ad64 100644 --- a/pkgs/development/libraries/openfx/default.nix +++ b/pkgs/development/libraries/openfx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { pname = "openfx"; @@ -11,8 +11,6 @@ stdenv.mkDerivation { sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548"; }; - nativeBuildInputs = [ unzip ]; - outputs = [ "dev" "out" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/openvdb/default.nix b/pkgs/development/libraries/openvdb/default.nix index b5317ce9aae..655d664d8fa 100644 --- a/pkgs/development/libraries/openvdb/default.nix +++ b/pkgs/development/libraries/openvdb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: +{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }: stdenv.mkDerivation rec { @@ -14,7 +14,6 @@ stdenv.mkDerivation rec outputs = [ "out" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ]; setSourceRoot = '' diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 904437bdcf6..1a7974ecd26 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -1,5 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi -, unzip }: +{ lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "python-simple-hipchat"; @@ -10,8 +9,6 @@ buildPythonPackage rec { sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; }; - nativeBuildInputs = [ unzip ]; - meta = with lib; { description = "Easy peasy wrapper for HipChat's v1 API"; homepage = "https://github.com/kurttheviking/simple-hipchat-py"; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index 217cbe5e029..dbcb8d52f1b 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -1,4 +1,4 @@ -{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, unzip, zip }: +{ autoconf, fetchurl, makedepend, perl, python3, lib, stdenv, zip }: stdenv.mkDerivation rec { name = "jscoverage-0.5.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ./jsfalse_to_null.patch ]; - nativeBuildInputs = [ unzip perl python3 zip ]; + nativeBuildInputs = [ perl python3 zip ]; strictDeps = true; diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 7302cfb25bc..6e4a38ed171 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, foomatic-filters, bc, unzip, ghostscript, systemd, vim, time }: +{ lib, stdenv, fetchurl, foomatic-filters, bc, ghostscript, systemd, vim, time }: stdenv.mkDerivation rec { pname = "foo2zjs"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { sha256 = "14x3wizvncdy0xgvmcx541qanwb7bg76abygqy17bxycn1zh5r1x"; }; - nativeBuildInputs = [ unzip ]; buildInputs = [ foomatic-filters bc ghostscript systemd vim ]; patches = [ ./no-hardcode-fw.diff ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 53f1009cfad..37e0d83f140 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: +, zlib, SDL, readline, libGLU, libGL, libX11 }: with lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; - nativeBuildInputs = [ autoreconfHook unzip ]; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib SDL readline libGLU libGL libX11 ]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index fda57cb9a54..162d018e729 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, jdk }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -7,8 +7,6 @@ stdenv.mkDerivation { sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; installPhase = '' diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index a7663bbd231..08d98716f1f 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, unzip }: +{ lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation rec { pname = "zpaq"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0v44rlg9gvwc4ggr2lhcqll8ppal3dk7zsg5bqwcc5lg3ynk2pz4"; }; - nativeBuildInputs = [ perl /* for pod2man */ unzip ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; preBuild = let CPPFLAGS = with stdenv; "" diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index b2e753342d9..858c114f68c 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, unzip, xz, dpkg +{lib, stdenv, fetchurl, xz, dpkg , libxslt, docbook_xsl, makeWrapper , python3Packages , perlPackages, curl, gnupg, diffutils @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ xz dpkg libxslt python setuptools curl gnupg diffutils ] ++ (with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]); diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 6cc13e6f87e..7aebfeab2ce 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, libogg, libvorbis }: +{ lib, stdenv, fetchurl, libogg, libvorbis }: stdenv.mkDerivation rec { name = "vorbisgain-0.37"; @@ -10,7 +10,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ unzip ]; buildInputs = [ libogg libvorbis ]; patchPhase = '' diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 660ba01bcd4..f1eaff5ec87 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -9,7 +9,6 @@ , pkg-config , mono , fsharp -, unzip , overrides ? {} }: @@ -897,8 +896,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "07r63xam6icm17pf6amh1qkmna13nxa3ncdan7a3ql307i5isriz"; }; - nativeBuildInputs = [ unzip ]; - phases = [ "unpackPhase" "installPhase" ]; outputFiles = [ "*" ]; From 65f7d4a1622189774aceea342acff6d3ab6faa57 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 17 May 2021 02:35:17 +0000 Subject: [PATCH 34/37] apprise: 0.9.1 -> 0.9.3 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index fad9e7d03fa..61cfed3dbb9 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.1"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FW5gt35yoXVr2+hiGBDJ/5jFFfIpn2Z9sDN8acoO4FI="; + sha256 = "sha256-yKzpyJHUIkVYVwrL6oCPMd+QSVML2czWmQHCemXWAMQ="; }; nativeBuildInputs = [ Babel installShellFiles ]; From 66201e2c1de3b385f79286c956a15f5b6d227126 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Sun, 16 May 2021 16:52:25 -0700 Subject: [PATCH 35/37] cntk: fix build --- pkgs/applications/science/math/cntk/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index e15e2a43d77..c007490c94d 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -33,6 +33,9 @@ in stdenv.mkDerivation rec { # Force OpenMPI to use g++ in PATH. OMPI_CXX = "g++"; + # Uses some deprecated tensorflow functions + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + buildInputs = [ openblas opencv3 libzip boost protobuf mpi ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn; @@ -40,7 +43,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-opencv=${opencv3}" "--with-libzip=${libzip.dev}" - "--with-openblas=${openblas}" + "--with-openblas=${openblas.dev}" "--with-boost=${boost.dev}" "--with-protobuf=${protobuf}" "--with-mpi=${mpi}" From 18b051fde589b77fabff5cbb984aa3a5769bf357 Mon Sep 17 00:00:00 2001 From: "J. Neto" Date: Fri, 14 May 2021 02:35:43 -0300 Subject: [PATCH 36/37] scite: 4.0.5 -> 5.0.2 --- pkgs/applications/editors/scite/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 3d6ec9ece9c..ab0fef9be26 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "scite"; - version = "4.0.5"; + version = "5.0.2"; src = fetchurl { - url = "https://www.scintilla.org/scite405.tgz"; - sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; + url = "https://www.scintilla.org/scite502.tgz"; + sha256 = "00n2gr915f7kvp2250dzn6n0p6lhr6qdlm1m7y2xi6qrrky0bpan"; }; nativeBuildInputs = [ pkg-config ]; @@ -14,6 +14,8 @@ stdenv.mkDerivation { sourceRoot = "scintilla/gtk"; buildPhase = '' + make + cd ../../lexilla/src make cd ../../scite/gtk make prefix=$out/ From e906410c9a6a8bcbad3ef8beeea963bad24afc0b Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Fri, 14 May 2021 13:47:18 +0200 Subject: [PATCH 37/37] solc: remove 0.7 release They're failing on Hydra, the workload to keep them working is not worth it. --- pkgs/development/compilers/solc/0.7.nix | 78 ------------------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 pkgs/development/compilers/solc/0.7.nix diff --git a/pkgs/development/compilers/solc/0.7.nix b/pkgs/development/compilers/solc/0.7.nix deleted file mode 100644 index 99b67b56510..00000000000 --- a/pkgs/development/compilers/solc/0.7.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib, gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils -, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null -, cln ? null, gmp ? null -}: - -# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, -# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS - -assert z3Support -> z3 != null && lib.versionAtLeast z3.version "4.6.0"; -assert cvc4Support -> cvc4 != null && cln != null && gmp != null; - -let - jsoncppVersion = "1.9.4"; - jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; - jsoncpp = fetchzip { - url = jsoncppUrl; - sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; - }; -in -gccStdenv.mkDerivation rec { - - pname = "solc"; - version = "0.7.4"; - - # upstream suggests avoid using archive generated by github - src = fetchzip { - url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg"; - }; - - postPatch = '' - substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppUrl}" ${jsoncpp} - ''; - - cmakeFlags = [ - "-DBoost_USE_STATIC_LIBS=OFF" - ] ++ lib.optionals (!z3Support) [ - "-DUSE_Z3=OFF" - ] ++ lib.optionals (!cvc4Support) [ - "-DUSE_CVC4=OFF" - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] - ++ lib.optionals z3Support [ z3 ] - ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python3 ]; - - # Test fails on darwin for unclear reason - doCheck = gccStdenv.hostPlatform.isLinux; - - checkPhase = '' - while IFS= read -r -d ''' dir - do - LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir - export LD_LIBRARY_PATH - done < <(find . -type d -print0) - - pushd .. - # IPC tests need aleth avaliable, so we disable it - sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do - patchShebangs "$i" - done - TERM=xterm ./scripts/tests.sh - popd - ''; - - meta = with lib; { - description = "Compiler for Ethereum smart contract language Solidity"; - homepage = "https://github.com/ethereum/solidity"; - license = licenses.gpl3; - platforms = with platforms; linux; # darwin is currently broken - maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - inherit version; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a6c0d979ce..caad30bf3bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11679,9 +11679,7 @@ in smlpkg = callPackage ../tools/package-management/smlpkg { }; - solc = solc_0_8; - solc_0_8 = callPackage ../development/compilers/solc { }; - solc_0_7 = callPackage ../development/compilers/solc/0.7.nix { }; + solc = callPackage ../development/compilers/solc { }; souffle = callPackage ../development/compilers/souffle { autoreconfHook = buildPackages.autoreconfHook269;