From 89de60a8ac8de525f6a06acd616a7e1cf7b3741a Mon Sep 17 00:00:00 2001 From: squalus Date: Sun, 19 Dec 2021 13:17:29 -0800 Subject: [PATCH 001/108] standardnotes: fix icon path --- pkgs/applications/editors/standardnotes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 4191f6fbd20..e9df8571f9d 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -49,6 +49,7 @@ in appimageTools.wrapType2 rec { # fixup and install desktop file ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value ${pname} standard-notes.desktop + mv usr/share/icons share rm usr/lib/* AppRun standard-notes.desktop .so* ''; From 10fdcd5e47ed0488f0cc806e7c940918b36ad15f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Apr 2022 00:44:51 +0000 Subject: [PATCH 002/108] python310Packages.malduck: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/malduck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 1b757a144cc..99472d4e874 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "malduck"; - version = "4.1.0"; + version = "4.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "04d8bhzax9ynbl83hif9i8gcs29zrvcay2r6n7mcxiixlxcqciak"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM="; }; propagatedBuildInputs = [ From ee374505e008fe595d93db775d2264fb15e6a7e2 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:49:18 -0500 Subject: [PATCH 003/108] syslogng: switch to python3 --- pkgs/tools/system/syslog-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index 6948728f16b..990e7afc39a 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, openssl, libcap, curl, which -, eventlog, pkg-config, glib, python2, systemd, perl +, eventlog, pkg-config, glib, python3, systemd, perl , riemann_c_client, protobufc, pcre, libnet , json_c, libuuid, libivykis, mongoc, rabbitmq-c , libesmtp @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { eventlog glib perl - python2 + python3 systemd riemann_c_client protobufc From 9f1019528df10b2b13d003f571df9a239b57bdea Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:56:21 -0500 Subject: [PATCH 004/108] ps_mem: switch to python3 --- pkgs/tools/system/ps_mem/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index 073a0921f98..8408ed5e8d1 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -1,10 +1,8 @@ -{ lib, python2Packages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -let - version = "3.13"; +python3Packages.buildPythonApplication rec { pname = "ps_mem"; -in python2Packages.buildPythonApplication { - name = "${pname}-${version}"; + version = "3.13"; src = fetchFromGitHub { owner = "pixelb"; From e7c3e490511d336b5a3ef23c5e7cd2aa3eb5b521 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 26 Apr 2022 12:33:47 -0400 Subject: [PATCH 005/108] obs-studio-plugins.obs-gstreamer: 0.2.1 -> 0.3.3 --- .../video/obs-studio/plugins/obs-gstreamer.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index d21d78c42b2..20c49692b8d 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,21 +10,21 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.2.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-gstreamer"; rev = "v${version}"; - sha256 = "1fdpwr8br8x9cnrhr3j4f0l81df26n3bj2ibi3cg96rl86054nid"; + hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg="; }; nativeBuildInputs = [ pkg-config meson ninja ]; - buildInputs = [ gst_all_1.gstreamermm obs-studio ]; + buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; meta = with lib; { description = "An OBS Studio source, encoder and video filter plugin to use GStreamer elements/pipelines in OBS Studio"; - homepage = "https://github.com/fswoch/obs-gstreamer"; + homepage = "https://github.com/fzwoch/obs-gstreamer"; maintainers = with maintainers; [ ahuzik ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; From 2cfd398b57b7c24f995140e78685d415959b07ef Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 15:04:13 -0500 Subject: [PATCH 006/108] ats2: 0.4.1 -> 0.4.2 --- pkgs/development/compilers/ats2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index e8c3af5d7e1..f8de9f57b5d 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -3,11 +3,11 @@ , withContrib ? true }: let - versionPkg = "0.4.1" ; + versionPkg = "0.4.2"; contrib = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz"; - sha256 = "184m4hz2xszhcfc6w9fw9qibhmcvgjmikwfwkb345xypr59jm93d"; + hash = "sha256-m0hfBLsaNiLaIktcioK+ZtWUsWht3IDSJ6CzgJmS06c="; }; postInstallContrib = lib.optionalString withContrib @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-gmp-${version}.tgz"; - sha256 = "0c4nqp6yzmpj0mcpg7ibmwyqi8hjw3sza8myvy4nzq3fa6wldy5l"; + hash = "sha256-UWgDjFojPBYgykrCrJyYvVWY+Gc5d4aRGjTWjc528AM="; }; buildInputs = [ gmp ]; From 0c494de2fd173be1abcf6ce8356221fb16a43a07 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 27 Apr 2022 19:04:09 +0200 Subject: [PATCH 007/108] airwindows-lv2: init at 1.0 --- .../audio/airwindows-lv2/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/audio/airwindows-lv2/default.nix diff --git a/pkgs/applications/audio/airwindows-lv2/default.nix b/pkgs/applications/audio/airwindows-lv2/default.nix new file mode 100644 index 00000000000..c3cc1a21ffc --- /dev/null +++ b/pkgs/applications/audio/airwindows-lv2/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, lv2 }: + +stdenv.mkDerivation rec { + pname = "airwindows-lv2"; + version = "1.0"; + src = fetchFromGitHub { + owner = "hannesbraun"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xokV4Af0evdo73D9JObzAmY1wD0aUyXiI0Z7BUN0m+M="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ lv2 ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/lv2" ]; + + meta = with lib; { + description = "Airwindows plugins (ported to LV2)"; + homepage = "https://github.com/hannesbraun/airwindows-lv2"; + license = licenses.mit; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1bda3c0e9..7a1a26b45f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1071,6 +1071,8 @@ with pkgs; airspyhf = callPackage ../applications/radio/airspyhf { }; + airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { From 36fcd5f0dc31a559d9cda91565c12d8ad66427e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 May 2022 06:27:11 +0000 Subject: [PATCH 008/108] kodiPackages.inputstreamhelper: 0.5.8+matrix.1 -> 0.5.10+matrix.1 --- .../video/kodi/addons/inputstreamhelper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index 7698e6619d9..1319f72f4e9 100644 --- a/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.8+matrix.1"; + version = "0.5.10+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "xdsUzmz8ji9JcYLEUFWwvXq0Oig5i08VPQD93K8R9hk="; + sha256 = "FcOktwtOT7kDM+3y9qPDk3xU1qVeCduyAdUzebtJzv4="; }; passthru = { From 562a1fcdc83b98bb2c433627c117c3e4c6bbbb16 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Mon, 2 May 2022 18:36:31 +0200 Subject: [PATCH 009/108] perlPackages.POSIXAtFork: init at 0.04 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 72568265a82..adf03ae7271 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -18989,6 +18989,20 @@ let }; }; + POSIXAtFork = buildPerlPackage { + pname = "POSIX-AtFork"; + version = "0.04"; + src = fetchurl { + url = "mirror://cpan/authors//id/N/NI/NIKOLAS/POSIX-AtFork-0.04.tar.gz"; + sha256 = "sha256-wuIpOobUhxRLyPe6COfEt2sRsOTf3EGAmEXTDvoH5g4="; + }; + buildInputs = [ TestSharedFork ]; + meta = { + description = "Hook registrations at fork(2)"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + POSIXstrftimeCompiler = buildPerlModule { pname = "POSIX-strftime-Compiler"; version = "0.44"; From 1d7cd163ce0830086932a138fcc6a8e1c86ec46d Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 8 Jan 2022 12:46:23 +1100 Subject: [PATCH 010/108] nixos/phosh: add Phosh, the Phone Shell --- .../services/x11/desktop-managers/default.nix | 2 +- .../services/x11/desktop-managers/phosh.nix | 73 +++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/x11/desktop-managers/phosh.nix diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 8247a7e381c..f48eac21bd8 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix + ./none.nix ./xterm.nix ./phosh.nix ./xfce.nix ./plasma5.nix ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome.nix ./retroarch.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix new file mode 100644 index 00000000000..e768f6f4c63 --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -0,0 +1,73 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.desktopManager.phosh; +in + +{ + options = { + services.xserver.desktopManager.phosh = { + enable = mkOption { + type = types.bool; + default = false; + description = "Enable the Phone Shell."; + }; + + package = mkOption { + type = types.package; + default = pkgs.phosh; + defaultText = literalExpression "pkgs.phosh"; + example = literalExpression "pkgs.phosh"; + description = '' + Package that should be used for Phosh. + ''; + }; + + user = mkOption { + description = "The user to run the Phosh service."; + type = types.str; + example = "alice"; + }; + + group = mkOption { + description = "The group to run the Phosh service."; + type = types.str; + example = "users"; + }; + }; + }; + + config = mkIf cfg.enable { + programs.phosh.enable = true; + + systemd.defaultUnit = "graphical.target"; + # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service + systemd.services.phosh = { + wantedBy = [ "graphical.target" ]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/phosh"; + User = cfg.user; + Group = cfg.group; + PAMName = "login"; + WorkingDirectory = "~"; + Restart = "always"; + + TTYPath = "/dev/tty7"; + TTYReset = "yes"; + TTYVHangup = "yes"; + TTYVTDisallocate = "yes"; + + # Fail to start if not controlling the tty. + StandardInput = "tty-fail"; + StandardOutput = "journal"; + StandardError = "journal"; + + # Log this user with utmp, letting it show up with commands 'w' and 'who'. + UtmpIdentifier = "tty7"; + UtmpMode = "user"; + }; + }; + }; +} From e0daeb01a7807be1a0e32ccd2e1b33178c85d23d Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Fri, 6 May 2022 00:03:53 +1000 Subject: [PATCH 011/108] programs/phosh: merge into services/x11/desktop-managers/phosh --- nixos/modules/module-list.nix | 1 - nixos/modules/programs/phosh.nix | 162 ------------------ .../services/x11/desktop-managers/phosh.nix | 148 +++++++++++++++- 3 files changed, 146 insertions(+), 165 deletions(-) delete mode 100644 nixos/modules/programs/phosh.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9d9f2e9057c..4d51eabccb8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -196,7 +196,6 @@ ./programs/partition-manager.nix ./programs/plotinus.nix ./programs/proxychains.nix - ./programs/phosh.nix ./programs/qt5ct.nix ./programs/screen.nix ./programs/sedutil.nix diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix deleted file mode 100644 index ad875616ac9..00000000000 --- a/nixos/modules/programs/phosh.nix +++ /dev/null @@ -1,162 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.programs.phosh; - - # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop - oskItem = pkgs.makeDesktopItem { - name = "sm.puri.OSK0"; - desktopName = "On-screen keyboard"; - exec = "${pkgs.squeekboard}/bin/squeekboard"; - categories = [ "GNOME" "Core" ]; - onlyShowIn = [ "GNOME" ]; - noDisplay = true; - extraConfig = { - X-GNOME-Autostart-Phase = "Panel"; - X-GNOME-Provides = "inputmethod"; - X-GNOME-Autostart-Notify = "true"; - X-GNOME-AutoRestart = "true"; - }; - }; - - phocConfigType = types.submodule { - options = { - xwayland = mkOption { - description = '' - Whether to enable XWayland support. - - To start XWayland immediately, use `immediate`. - ''; - type = types.enum [ "true" "false" "immediate" ]; - default = "false"; - }; - cursorTheme = mkOption { - description = '' - Cursor theme to use in Phosh. - ''; - type = types.str; - default = "default"; - }; - outputs = mkOption { - description = '' - Output configurations. - ''; - type = types.attrsOf phocOutputType; - default = { - DSI-1 = { - scale = 2; - }; - }; - }; - }; - }; - - phocOutputType = types.submodule { - options = { - modeline = mkOption { - description = '' - One or more modelines. - ''; - type = types.either types.str (types.listOf types.str); - default = []; - example = [ - "87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync" - "65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync" - ]; - }; - mode = mkOption { - description = '' - Default video mode. - ''; - type = types.nullOr types.str; - default = null; - example = "768x1024"; - }; - scale = mkOption { - description = '' - Display scaling factor. - ''; - type = types.nullOr types.ints.unsigned; - default = null; - example = 2; - }; - rotate = mkOption { - description = '' - Screen transformation. - ''; - type = types.enum [ - "90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null - ]; - default = null; - }; - }; - }; - - optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}"; - - renderPhocOutput = name: output: let - modelines = if builtins.isList output.modeline - then output.modeline - else [ output.modeline ]; - renderModeline = l: "modeline = ${l}"; - in '' - [output:${name}] - ${concatStringsSep "\n" (map renderModeline modelines)} - ${optionalKV "mode" output.mode} - ${optionalKV "scale" output.scale} - ${optionalKV "rotate" output.rotate} - ''; - - renderPhocConfig = phoc: let - outputs = mapAttrsToList renderPhocOutput phoc.outputs; - in '' - [core] - xwayland = ${phoc.xwayland} - ${concatStringsSep "\n" outputs} - [cursor] - theme = ${phoc.cursorTheme} - ''; -in { - options = { - programs.phosh = { - enable = mkEnableOption '' - Whether to enable, Phosh, related packages and default configurations. - ''; - phocConfig = mkOption { - description = '' - Configurations for the Phoc compositor. - ''; - type = types.oneOf [ types.lines types.path phocConfigType ]; - default = {}; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ - pkgs.phoc - pkgs.phosh - pkgs.squeekboard - oskItem - ]; - - systemd.packages = [ pkgs.phosh ]; - - programs.feedbackd.enable = true; - - security.pam.services.phosh = {}; - - hardware.opengl.enable = mkDefault true; - - services.gnome.core-shell.enable = true; - services.gnome.core-os-services.enable = true; - services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; - - environment.etc."phosh/phoc.ini".source = - if builtins.isPath cfg.phocConfig then cfg.phocConfig - else if builtins.isString cfg.phocConfig then pkgs.writeText "phoc.ini" cfg.phocConfig - else pkgs.writeText "phoc.ini" (renderPhocConfig cfg.phocConfig); - }; -} diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index e768f6f4c63..4bf78fa16e7 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -4,6 +4,120 @@ with lib; let cfg = config.services.xserver.desktopManager.phosh; + + # Based on https://source.puri.sm/Librem5/librem5-base/-/blob/4596c1056dd75ac7f043aede07887990fd46f572/default/sm.puri.OSK0.desktop + oskItem = pkgs.makeDesktopItem { + name = "sm.puri.OSK0"; + desktopName = "On-screen keyboard"; + exec = "${pkgs.squeekboard}/bin/squeekboard"; + categories = [ "GNOME" "Core" ]; + onlyShowIn = [ "GNOME" ]; + noDisplay = true; + extraConfig = { + X-GNOME-Autostart-Phase = "Panel"; + X-GNOME-Provides = "inputmethod"; + X-GNOME-Autostart-Notify = "true"; + X-GNOME-AutoRestart = "true"; + }; + }; + + phocConfigType = types.submodule { + options = { + xwayland = mkOption { + description = '' + Whether to enable XWayland support. + + To start XWayland immediately, use `immediate`. + ''; + type = types.enum [ "true" "false" "immediate" ]; + default = "false"; + }; + cursorTheme = mkOption { + description = '' + Cursor theme to use in Phosh. + ''; + type = types.str; + default = "default"; + }; + outputs = mkOption { + description = '' + Output configurations. + ''; + type = types.attrsOf phocOutputType; + default = { + DSI-1 = { + scale = 2; + }; + }; + }; + }; + }; + + phocOutputType = types.submodule { + options = { + modeline = mkOption { + description = '' + One or more modelines. + ''; + type = types.either types.str (types.listOf types.str); + default = []; + example = [ + "87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync" + "65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync" + ]; + }; + mode = mkOption { + description = '' + Default video mode. + ''; + type = types.nullOr types.str; + default = null; + example = "768x1024"; + }; + scale = mkOption { + description = '' + Display scaling factor. + ''; + type = types.nullOr types.ints.unsigned; + default = null; + example = 2; + }; + rotate = mkOption { + description = '' + Screen transformation. + ''; + type = types.enum [ + "90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null + ]; + default = null; + }; + }; + }; + + optionalKV = k: v: if v == null then "" else "${k} = ${builtins.toString v}"; + + renderPhocOutput = name: output: let + modelines = if builtins.isList output.modeline + then output.modeline + else [ output.modeline ]; + renderModeline = l: "modeline = ${l}"; + in '' + [output:${name}] + ${concatStringsSep "\n" (map renderModeline modelines)} + ${optionalKV "mode" output.mode} + ${optionalKV "scale" output.scale} + ${optionalKV "rotate" output.rotate} + ''; + + renderPhocConfig = phoc: let + outputs = mapAttrsToList renderPhocOutput phoc.outputs; + in '' + [core] + xwayland = ${phoc.xwayland} + ${concatStringsSep "\n" outputs} + [cursor] + theme = ${phoc.cursorTheme} + ''; in { @@ -36,12 +150,18 @@ in type = types.str; example = "users"; }; + + phocConfig = mkOption { + description = '' + Configurations for the Phoc compositor. + ''; + type = types.oneOf [ types.lines types.path phocConfigType ]; + default = {}; + }; }; }; config = mkIf cfg.enable { - programs.phosh.enable = true; - systemd.defaultUnit = "graphical.target"; # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service systemd.services.phosh = { @@ -69,5 +189,29 @@ in UtmpMode = "user"; }; }; + + environment.systemPackages = [ + pkgs.phoc + cfg.package + pkgs.squeekboard + oskItem + ]; + + systemd.packages = [ cfg.package ]; + + programs.feedbackd.enable = true; + + security.pam.services.phosh = {}; + + hardware.opengl.enable = mkDefault true; + + services.gnome.core-shell.enable = true; + services.gnome.core-os-services.enable = true; + services.xserver.displayManager.sessionPackages = [ cfg.package ]; + + environment.etc."phosh/phoc.ini".source = + if builtins.isPath cfg.phocConfig then cfg.phocConfig + else if builtins.isString cfg.phocConfig then pkgs.writeText "phoc.ini" cfg.phocConfig + else pkgs.writeText "phoc.ini" (renderPhocConfig cfg.phocConfig); }; } From aee3781ae8c00df9faf29130856caf4445c09dab Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 5 May 2022 14:12:31 -0500 Subject: [PATCH 012/108] amazon-qldb-shell: fix on darwin On Darwin, the linker needs access to the Security framework. --- pkgs/development/tools/amazon-qldb-shell/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/amazon-qldb-shell/default.nix b/pkgs/development/tools/amazon-qldb-shell/default.nix index d017c213415..5699bc7c61b 100644 --- a/pkgs/development/tools/amazon-qldb-shell/default.nix +++ b/pkgs/development/tools/amazon-qldb-shell/default.nix @@ -1,10 +1,12 @@ -{ lib +{ stdenv +, lib , clang , cmake , fetchFromGitHub , llvmPackages , rustPlatform , testers +, Security }: let @@ -21,7 +23,8 @@ let }; nativeBuildInputs = [ clang cmake ]; - buildInputs = [ llvmPackages.libclang ]; + buildInputs = [ llvmPackages.libclang ] + ++ lib.optional stdenv.isDarwin Security; cargoSha256 = "sha256-y3dNEa2U9mwsENPda44zweszlk4UJXGtfeH+er8mi0U="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44224353a2a..03149a011be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1652,7 +1652,9 @@ with pkgs; amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { }; - amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { }; + amazon-qldb-shell = callPackage ../development/tools/amazon-qldb-shell { + inherit (darwin.apple_sdk.frameworks) Security; + }; amber = callPackage ../tools/text/amber { inherit (darwin.apple_sdk.frameworks) Security; From 404e681f0278a4671524a701a288a4a4ef1eedd1 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 5 May 2022 22:28:32 +0200 Subject: [PATCH 013/108] illum: Prevent segfault when unplugging keyboards illum segfaults when unplugging keybords, see upstream issue [1]. The upstream PR [2] is still open. [1]: https://github.com/jmesmon/illum/issues/19 [2]: https://github.com/jmesmon/illum/pull/20 --- pkgs/tools/system/illum/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index ffa016cabfe..c9e87bef621 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ninja, libevdev, libev, udev }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, ninja, libevdev, libev, udev }: stdenv.mkDerivation rec { pname = "illum"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + (fetchpatch { + name = "prevent-unplug-segfault"; # See https://github.com/jmesmon/illum/issues/19 + url = "https://github.com/jmesmon/illum/commit/47b7cd60ee892379e5d854f79db343a54ae5a3cc.patch"; + sha256 = "sha256-hIBBCIJXAt8wnZuyKye1RiEfOCelP3+4kcGrM43vFOE="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ninja libevdev libev udev ]; From fd3d1a834bb17fc76c89175e8aa690bbf21f8b04 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 5 May 2022 22:31:56 +0200 Subject: [PATCH 014/108] illum: Restart service on failure If there is a fatal error and illum exits, it should be safe to restart it. --- nixos/modules/services/hardware/illum.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/illum.nix b/nixos/modules/services/hardware/illum.nix index ff73c99a653..7f7a8500023 100644 --- a/nixos/modules/services/hardware/illum.nix +++ b/nixos/modules/services/hardware/illum.nix @@ -28,6 +28,7 @@ in { description = "Backlight Adjustment Service"; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.illum}/bin/illum-d"; + serviceConfig.Restart = "on-failure"; }; }; From 23b04d2ed9bbdfe6dfa06cef1431c5713312e135 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 02:10:53 +0000 Subject: [PATCH 015/108] deno: 1.21.1 -> 1.21.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4a2fc5aafc5..455b215bb51 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.21.1"; + version = "1.21.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-97KWvaxjIxdWjpuJHYzKbYmQZvAcDW/rzj0VkvnQas4="; + sha256 = "sha256-oRlrommD84x4M+Z/F70TjFwWSlvTb26v36zxgaMBifw="; }; - cargoSha256 = "sha256-cqKxKHX/xQLvDN5FwyjB/2aHgm3KZsjxHVRiugYIvQE="; + cargoSha256 = "sha256-kVNT9B9B3Li9B8aRFkUx5WkGZH7eqSMQO0GRPTC5tgU="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 2217e87dd04f49a8aaaaa6594b7ea0bda3a6ce31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 02:41:11 +0000 Subject: [PATCH 016/108] erlang-ls: 0.31.0 -> 0.32.0 --- 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 47fbcc5f38e..badda3a6a57 100644 --- a/pkgs/development/beam-modules/erlang-ls/default.nix +++ b/pkgs/development/beam-modules/erlang-ls/default.nix @@ -1,7 +1,7 @@ { fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper , stdenv, writeScript, lib }: let - version = "0.31.0"; + version = "0.32.0"; owner = "erlang-ls"; repo = "erlang_ls"; deps = import ./rebar-deps.nix { @@ -19,7 +19,7 @@ rebar3Relx { inherit version; src = fetchFromGitHub { inherit owner repo; - sha256 = "sha256-tpJUCHrSFNEzNrln7nKwav0GSBW+4fwjSB3WI1MKW9A="; + sha256 = "sha256-aYMfsaqdsxlWatvXBWIxKJ7baruH1kqp2nrXL+/IrUQ="; rev = version; }; releaseType = "escript"; From 908fd5ac2e804d48aab32580e7e0c140d3877914 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 May 2022 02:47:18 +0000 Subject: [PATCH 017/108] python310Packages.spglib: 1.16.3 -> 1.16.5 --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index a54fa65d08b..067b26cd232 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.16.3"; + version = "1.16.5"; src = fetchPypi { inherit pname version; - sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038"; + sha256 = "sha256-Lqzv1TzGRLqakMRoH9bJNLa92BjBE9fzGZBOB41dq5M="; }; propagatedBuildInputs = [ numpy ]; From 0446cf377a30698371357f012befee240d17cbdb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 018/108] python39Packages.spglib: execute tests --- pkgs/development/python-modules/spglib/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 067b26cd232..3f9a2aeb71d 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, nose, pyyaml }: +{ lib, buildPythonPackage, fetchPypi, numpy, pytest, pyyaml }: buildPythonPackage rec { pname = "spglib"; @@ -11,7 +11,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose pyyaml ]; + checkInputs = [ pytest pyyaml ]; + + # pytestCheckHook doesn't work + # ImportError: cannot import name '_spglib' from partially initialized module 'spglib' + checkPhase = '' + pytest + ''; + + pythonImportsCheck = [ "spglib" ]; meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; From 12c01a01ca96221259f0729673aa499303244c3e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 019/108] hstr: 2.3 -> 2.5 https://github.com/dvorka/hstr/releases/tag/2.4 https://github.com/dvorka/hstr/releases/tag/2.5 --- pkgs/applications/misc/hstr/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 888c7892514..bb31be1ad27 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,27 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, readline, ncurses +{ lib, stdenv, fetchFromGitHub, readline, ncurses , autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "dvorka"; repo = "hstr"; rev = version; - sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; + sha256 = "sha256-qIMnU+gRR3HPAOrrrduN68R5E8ZJKROfZ0sEHL0E4XU="; }; - patches = [ - # pull pending upstream inclusion fix for ncurses-6.3: - # https://github.com/dvorka/hstr/pull/435 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/dvorka/hstr/commit/7fbd852c464ae3cfcd2f4fed9c62a21fb84c5439.patch"; - sha256 = "15f0ja4bsh4jnchcg0ray8ijpdraag7k07ss87a6ymfs1rg6i0jr"; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; From caf67e859cf958653dc004490e705f96b12b72c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 020/108] tflint: 0.35.0 -> 0.36.2 https://github.com/terraform-linters/tflint/releases/tag/v0.36.0 https://github.com/terraform-linters/tflint/releases/tag/v0.36.1 https://github.com/terraform-linters/tflint/releases/tag/v0.36.2 --- pkgs/development/tools/analysis/tflint/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 33e5de472c2..9ecc01c0a48 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,21 +2,23 @@ buildGoModule rec { pname = "tflint"; - version = "0.35.0"; + version = "0.36.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rLPKc9QeT9r0JUYcTMSHPa/4FxYiMLMdnv2iOMdBAy0="; + sha256 = "sha256-DPgYc0nUrRkidWqhv0X9v+2VSNPy1+0ZQ2gCe7T2gu0="; }; - vendorSha256 = "sha256-J1PgrWFAu1LrAYdoJP3HUunz/MkJ4Co0+hc7e6nFTBo="; + vendorSha256 = "sha256-Is4dpBu/Nm34NZ3NftSGTZnSR8831kM56dvBjtfUTGU="; doCheck = false; subPackages = [ "." ]; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; From 3701ffd5aba87dd6225a26a5a15bcfadb1dce97f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 021/108] python39Packages.spglib: update meta --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 3f9a2aeb71d..d317f11dea4 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; - homepage = "https://atztogo.github.io/spglib"; + homepage = "https://spglib.github.io/spglib/"; + changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; } - From 3b2a48345c0302c84be0f68ff6edd985dbbaa17e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 022/108] exempi: fix build on darwin --- pkgs/top-level/all-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d81096ac18..bcac9844ecf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5655,8 +5655,10 @@ with pkgs; }; exempi = callPackage ../development/libraries/exempi { - stdenv = if stdenv.isi686 then gcc6Stdenv else gcc9Stdenv; - boost = boost15x; + stdenv = if stdenv.isDarwin then stdenv + else if stdenv.isi686 then gcc6Stdenv + else gcc9Stdenv; + boost = if stdenv.isDarwin then boost else boost15x; }; execline = skawarePackages.execline; From aaba4db63ea726420f19723a75a8ecb92e4820c4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 023/108] libpg_query: 13-2.1.0 -> 13-2.1.1 https://github.com/pganalyze/libpg_query/releases/tag/13-2.1.1 --- pkgs/development/libraries/libpg_query/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpg_query/default.nix b/pkgs/development/libraries/libpg_query/default.nix index ba554065cfc..1319a8eedf8 100644 --- a/pkgs/development/libraries/libpg_query/default.nix +++ b/pkgs/development/libraries/libpg_query/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpg_query"; - version = "13-2.1.0"; + version = "13-2.1.1"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; rev = version; - sha256 = "sha256-DpvPmBvpx5pWDlx6T3Kp82ALi6FjOO549Exd8tWXDIk="; + sha256 = "sha256-195WNTTdXHHPbQg2Ipwa3v/qPEeAtehvZa2OC1egoFo="; }; nativeBuildInputs = [ which ]; From 02f86f3dbd9ddac9e7aac16be14e4b99fd7da696 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 May 2022 13:00:06 +0200 Subject: [PATCH 024/108] _1password-gui: 8.6.1 -> 8.7.0 --- pkgs/applications/misc/1password-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index c43df6b5f57..72b542e24fe 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.6.1"; + version = "8.7.0"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-CbSx1UJAvNrA1gTQyi6r8NgjwQ7H+tqWU9t3TUNrDMg="; + sha256 = "sha256-Ubn1KEjK8H8d8+4QNEpEOuclWyD8ujUbO5CpzWr+kSg="; }; nativeBuildInputs = [ makeWrapper ]; From fa1ea673335c749c8654069a5160705643195087 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Fri, 6 May 2022 13:00:34 +0200 Subject: [PATCH 025/108] _1password-gui-beta: 8.7.0-49.BETA -> 8.8.0-11.BETA --- pkgs/applications/misc/1password-gui/beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/1password-gui/beta.nix b/pkgs/applications/misc/1password-gui/beta.nix index 480366921ae..d9d21f30f34 100644 --- a/pkgs/applications/misc/1password-gui/beta.nix +++ b/pkgs/applications/misc/1password-gui/beta.nix @@ -42,11 +42,11 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.7.0-49.BETA"; + version = "8.8.0-11.BETA"; src = fetchurl { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-cYT9Pi2WEjZQ5P7Dr84l65AHyD8tZrYC+m4hFxSsNd4="; + sha256 = "sha256-HU+nIz3aKXXdBWEBMSRlbi8yZ+JEsE33o6nfbWRgpBo="; }; nativeBuildInputs = [ makeWrapper ]; From 2c3dcb11696825a16ee73470c6e9000cc8383f49 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 6 May 2022 13:59:08 -0400 Subject: [PATCH 026/108] step-ca: 0.18.2 -> 0.19.0 --- pkgs/tools/security/step-ca/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index b650b93f411..5877910ad2c 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "step-ca"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "smallstep"; @@ -53,7 +53,6 @@ buildGoModule rec { description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai mohe2015 ]; - platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ cmcdragonkai mohe2015 techknowlogick ]; }; } From e1ae57055baa91b537bff1174624bb6544148932 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 May 2022 21:16:21 +0200 Subject: [PATCH 027/108] chromiumBeta: 102.0.5005.27 -> 102.0.5005.40 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9ea70debaf3..95d434e1336 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -19,9 +19,9 @@ } }, "beta": { - "version": "102.0.5005.27", - "sha256": "0fznry72w50dpijg55yxkaz1hv1zkvvxini3yxadwpfa5y0mpn3m", - "sha256bin64": "0k543zz3njsn5kh1wf90hqywll9s6g4xrnh2zqph066l91gj17rx", + "version": "102.0.5005.40", + "sha256": "1max5ndvl59j2hlv9k88dmadr4q05q1clzlc6zba0gcbvqx5q9jb", + "sha256bin64": "1byqx9w0hqwk3vizdas3dylbm69108bnq4xlm0mp1p1gh37h1642", "deps": { "gn": { "version": "2022-04-14", From fdeff962623f3d161d93c18db6ed8475b0fe2b07 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 6 May 2022 21:16:21 +0200 Subject: [PATCH 028/108] chromiumDev: 103.0.5028.0 -> 103.0.5042.0 --- .../networking/browsers/chromium/upstream-info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9ea70debaf3..c01d75bade2 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -32,15 +32,15 @@ } }, "dev": { - "version": "103.0.5028.0", - "sha256": "06i6kgsdril5gfbjl1sh0z5hqvq64bchhb2z8w0h8cw9977bvqk6", - "sha256bin64": "09hxvcv5n1kd4qnwh6pxzmrlnc8xijm7rwb1c8c57v0jjb32x9ry", + "version": "103.0.5042.0", + "sha256": "0wm8m1mff8gb0x7whif16gvmhibgc8ndygnawkwq3g4fvninb65h", + "sha256bin64": "0vzmpi36a86kgxhdxvbqbn7i1wf2annar1mi15gra1cjpz3lf9kh", "deps": { "gn": { - "version": "2022-04-26", + "version": "2022-05-02", "url": "https://gn.googlesource.com/gn", - "rev": "ced9fbfe6943854e65ada4ac1849d1fa4cb19348", - "sha256": "14fgjsfqihmma1cr8n30n37vxkf20paa6swq2yxn1agjvfr9cdvl" + "rev": "53ef169800760fdc09f0773bf380fe99eaeab339", + "sha256": "08i7qc4qvf8gb3vryajvww75wk653fybf1bb2k40r8i07znhy78r" } } }, From 3e9e7fb9a14874ebe165b52f019ea30e29c2f3eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 22:22:37 +0200 Subject: [PATCH 029/108] python310Packages.pylint-plugin-utils: 0.6 -> 0.7 --- .../pylint-plugin-utils/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pylint-plugin-utils/default.nix b/pkgs/development/python-modules/pylint-plugin-utils/default.nix index f2bbef2cc8c..46c12f0d0d0 100644 --- a/pkgs/development/python-modules/pylint-plugin-utils/default.nix +++ b/pkgs/development/python-modules/pylint-plugin-utils/default.nix @@ -1,39 +1,46 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchFromGitHub -, isPy3k -, lib - -# pythonPackages , pylint +, pytestCheckHook +, pythonOlder , toml }: buildPythonPackage rec { pname = "pylint-plugin-utils"; - version = "0.6"; - disabled = !isPy3k; + version = "0.7"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "1zapmbczxs1phrwbd0yvpfxhljd2pyv4pi9rwggaq38lcnc325s7"; + hash = "sha256-uDsSSUWdlzuQz6umoYLbIotOYNEnLQu041ZZVMRd2ww="; }; propagatedBuildInputs = [ - pylint toml + pylint + toml + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pylint_plugin_utils" ]; - checkPhase = '' - python tests.py - ''; + # https://github.com/PyCQA/pylint-plugin-utils/issues/26 + doCheck = false; meta = with lib; { description = "Utilities and helpers for writing Pylint plugins"; homepage = "https://github.com/PyCQA/pylint-plugin-utils"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ kamadorueda ]; }; } From 308bd3ae9b3b9c8ec31d27bce4af685b7844d97f Mon Sep 17 00:00:00 2001 From: Victor Buttner Date: Wed, 10 Nov 2021 08:54:40 +0100 Subject: [PATCH 030/108] yersinia: init at 0.8.2 --- pkgs/tools/security/yersinia/default.nix | 54 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/security/yersinia/default.nix diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix new file mode 100644 index 00000000000..390ed880ca1 --- /dev/null +++ b/pkgs/tools/security/yersinia/default.nix @@ -0,0 +1,54 @@ +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fetchpatch +, ncurses, libpcap, libnet +# alpha version of GTK interface +, withGtk ? false, gtk2 +# enable remote admin interface +, enableAdmin ? false +}: + +stdenv.mkDerivation rec { + pname = "yersinia"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "tomac"; + repo = pname; + rev = "v${version}"; + sha256 = "06yfpf9iyi525rly1ychsihzvw3sas8kp0nxxr99xkwiqp5dc78b"; + }; + + patches = [ + # ncurses-6.3 support, included in next release + (fetchpatch { + name = "ncurses-6.3.patch"; + url = "https://github.com/tomac/yersinia/commit/d91bbf6f475e7ea39f131b77ce91b2de9646d5ca.patch"; + sha256 = "fl1pZKWA+nLtBm9+3FBFqaeuVZjszQCNkNl6Cf++BAI="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ libpcap libnet ncurses ] + ++ lib.optional withGtk gtk2; + + autoreconfPhase = "./autogen.sh"; + + configureFlags = [ + "--with-pcap-includes=${libpcap}/include" + "--with-libnet-includes=${libnet}/include" + ] + ++ lib.optional (!enableAdmin) "--disable-admin" + ++ lib.optional (!withGtk) "--disable-gtk"; + + makeFlags = [ "LDFLAGS=-lncurses" ]; + + meta = with lib; { + description = "A framework for layer 2 attacks"; + homepage = "https://github.com/tomac/yersinia"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ vdot0x23 ]; + # INSTALL and FAQ in this package seem a little outdated + # so not sure, but it could work on openbsd, illumos, and freebsd + # if you have a machine to test with, feel free to add these + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 635c9743523..f865a046258 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33369,6 +33369,8 @@ with pkgs; yarGen = callPackage ../tools/security/yarGen { }; + yersinia = callPackage ../tools/security/yersinia { }; + yaxg = callPackage ../tools/graphics/yaxg {}; yuzu-mainline = import ../misc/emulators/yuzu { From e1b3db7d1a5ed5c82f583e68cb0b4b9e15d44a6b Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 6 May 2022 23:50:51 +0300 Subject: [PATCH 031/108] polybar: 3.6.2 -> 3.6.3 --- pkgs/applications/misc/polybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index f737f18d158..ab99adbc487 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "polybar"; - version = "3.6.2"; + version = "3.6.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - hash = "sha256-mLAcA8afGLNhRRU/x/TngCMcSRXdEM5wKWoYZhezJqU="; + hash = "sha256-FKkPSAEMzptnjJq3xTk+fpD8XjASQ3smX5imstDyLNE="; fetchSubmodules = true; }; From 8a5fcd583fd14ebbcd6654fbcbd35ec14aa96a28 Mon Sep 17 00:00:00 2001 From: ckie Date: Fri, 6 May 2022 23:51:48 +0300 Subject: [PATCH 032/108] polybar: add ckie to maintainers --- pkgs/applications/misc/polybar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index ab99adbc487..b670f85f7a6 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { having a black belt in shell scripting. ''; license = licenses.mit; - maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ]; + maintainers = with maintainers; [ afldcr Br1ght0ne fortuneteller2k ckie ]; platforms = platforms.linux; }; } From b959e05dc7472845099aec971177129f95484328 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 23:09:29 +0200 Subject: [PATCH 033/108] python310Packages.django-tastypie: init at 0.14.4 --- .../django-tastypie/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/django-tastypie/default.nix diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix new file mode 100644 index 00000000000..a6c184e2d67 --- /dev/null +++ b/pkgs/development/python-modules/django-tastypie/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, python-mimeparse +, pythonOlder +}: + +buildPythonPackage rec { + pname = "django-tastypie"; + version = "0.14.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "django-tastypie"; + repo = pname; + rev = "v${version}"; + hash = "sha256-O/aVi8BshOZmg9WQxrFlBEOXfgyqJKVK/QlEFG3Edqs="; + }; + + propagatedBuildInputs = [ + python-dateutil + python-mimeparse + ]; + + # Tests requires a Django instance + doCheck = false; + + pythonImportsCheck = [ + "tastypie" + ]; + + meta = with lib; { + description = "Utilities and helpers for writing Pylint plugins"; + homepage = "https://github.com/django-tastypie/django-tastypie"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16c87e27223..9a13b7e084a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2394,6 +2394,8 @@ in { django-taggit = callPackage ../development/python-modules/django-taggit { }; + django-tastypie = callPackage ../development/python-modules/django-tastypie { }; + django-timezone-field = callPackage ../development/python-modules/django-timezone-field { }; django_treebeard = callPackage ../development/python-modules/django_treebeard { }; From d5681e0473cf43eb452185060fa7870ebfc2f53c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 6 May 2022 23:12:04 +0200 Subject: [PATCH 034/108] python310Packages.pylint-django: 2.5.2 -> 2.5.3 --- .../python-modules/pylint-django/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 61d49bd3ba0..ca26f11ccb3 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -1,24 +1,25 @@ { lib , buildPythonPackage -, coverage , django , factory_boy , fetchFromGitHub -, isPy3k , pylint-plugin-utils , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "pylint-django"; - version = "2.5.2"; - disabled = !isPy3k; + version = "2.5.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VgGdV1T154LauclGo6jpLPUrYn5vTOWwvO4IXQ9se7c="; + hash = "sha256-5xEXjNMkOetRM9NDz0S4DsC6v39YQi34s2s+Fs56hYU="; }; propagatedBuildInputs = [ @@ -27,7 +28,6 @@ buildPythonPackage rec { ]; checkInputs = [ - coverage factory_boy pytestCheckHook ]; @@ -38,6 +38,7 @@ buildPythonPackage rec { "external_factory_boy_noerror" "func_noerror_foreign_key_attributes" "func_noerror_foreign_key_key_cls_unbound" + "test_everything" ]; pythonImportsCheck = [ From 1b73d6e9a3bd52fa5249829dd38dafffa40167b5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 6 May 2022 17:18:52 -0400 Subject: [PATCH 035/108] python3Packages.sdds: init at 0.2.1 --- .../python-modules/sdds/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/sdds/default.nix diff --git a/pkgs/development/python-modules/sdds/default.nix b/pkgs/development/python-modules/sdds/default.nix new file mode 100644 index 00000000000..3003dddce6d --- /dev/null +++ b/pkgs/development/python-modules/sdds/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "sdds"; + version = "0.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "pylhc"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JcxcF0tDigZz3upzE7rPDynCH45dnLk/zpS0a2dOwRU="; + }; + + propagatedBuildInputs = [ numpy ]; + + pythonImportsCheck = [ "sdds" ]; + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Python 3 package to handle SDDS files"; + homepage = "https://pylhc.github.io/sdds/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50ed104cbe8..66f020227b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9291,6 +9291,8 @@ in { scs = callPackage ../development/python-modules/scs { }; + sdds = callPackage ../development/python-modules/sdds { }; + sdnotify = callPackage ../development/python-modules/sdnotify { }; seaborn = callPackage ../development/python-modules/seaborn { }; From 115475ff5b8e8ff652abb01fa6b018fbb5866f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 01:18:35 +0200 Subject: [PATCH 036/108] python310Packages.python-magic: normalise attr --- pkgs/applications/misc/lutris/default.nix | 6 +++--- .../irc/weechat/scripts/weechat-matrix/default.nix | 2 +- pkgs/applications/networking/mailreaders/alot/default.nix | 2 +- pkgs/applications/office/paperless-ngx/default.nix | 2 +- pkgs/development/python-modules/androguard/default.nix | 4 ++-- pkgs/development/python-modules/beancount/default.nix | 4 ++-- .../python-modules/django-versatileimagefield/default.nix | 4 ++-- .../python-modules/karton-classifier/default.nix | 4 ++-- pkgs/development/python-modules/mastodon-py/default.nix | 4 ++-- pkgs/development/python-modules/mocket/default.nix | 4 ++-- pkgs/development/python-modules/pushbullet/default.nix | 4 ++-- pkgs/development/python-modules/pysnow/default.nix | 4 ++-- pkgs/development/python-modules/relatorio/default.nix | 4 ++-- pkgs/servers/mautrix-facebook/default.nix | 2 +- pkgs/servers/mautrix-signal/default.nix | 2 +- pkgs/servers/mautrix-telegram/default.nix | 2 +- pkgs/servers/pinnwand/steck.nix | 2 +- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/tools/networking/s3cmd/default.nix | 4 ++-- pkgs/tools/security/hfinger/default.nix | 2 +- pkgs/tools/security/pass/extensions/import.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 23 files changed, 35 insertions(+), 34 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index e48065e6d9a..58946f227ee 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -31,7 +31,7 @@ , pyyaml , requests , keyring -, python_magic +, python-magic # commands that lutris needs , xrandr @@ -104,7 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk - python_magic + python-magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -117,7 +117,7 @@ buildPythonApplication rec { pillow dbus-python keyring - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index a900a469e03..2dc16701222 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -18,7 +18,7 @@ let scriptPython = python.withPackages (ps: with ps; [ aiohttp requests - python_magic + python-magic ]); version = "0.3.0"; diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cb49829dce0..d8a4d1066ec 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -40,7 +40,7 @@ with python3.pkgs; buildPythonApplication rec { file gpgme notmuch2 - python_magic + python-magic service-identity twisted urwid diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index ec83da852ab..dce6869f36e 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -106,7 +106,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { python-dotenv python-gnupg python-Levenshtein - python_magic + python-magic pytz pyyaml redis diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 42f37e13099..5584f2bd671 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -17,7 +17,7 @@ , nose , nose-timer , mock -, python_magic +, python-magic , codecov , coverage , qt5 @@ -70,7 +70,7 @@ buildPythonPackage rec { nose-timer pyperclip pyqt5 - python_magic + python-magic ]; inherit doCheck; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index d4ced793f83..6ba700cc6e2 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -12,7 +12,7 @@ , oauth2client , ply , pytest -, python_magic +, python-magic , requests }: @@ -40,7 +40,7 @@ buildPythonPackage rec { lxml oauth2client ply - python_magic + python-magic requests # pytest really is a runtime dependency # https://github.com/beancount/beancount/blob/v2/setup.py#L81-L82 diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index eefda80f18e..01c1b8353ba 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -3,7 +3,7 @@ , fetchPypi , django , pillow -, python_magic +, python-magic }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { inherit pname version; sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; }; - propagatedBuildInputs = [ pillow python_magic ]; + propagatedBuildInputs = [ pillow python-magic ]; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix index ca2703389b3..8195632bdfd 100644 --- a/pkgs/development/python-modules/karton-classifier/default.nix +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , karton-core , pytestCheckHook -, python_magic +, python-magic , pythonOlder }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet karton-core - python_magic + python-magic ]; postPatch = '' diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index c1a7c8985b7..178ed4b8fc0 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -6,7 +6,7 @@ , decorator , http-ece , python-dateutil -, python_magic +, python-magic , pytz , requests , six @@ -37,7 +37,7 @@ buildPythonPackage rec { decorator http-ece python-dateutil - python_magic + python-magic pytz requests six diff --git a/pkgs/development/python-modules/mocket/default.nix b/pkgs/development/python-modules/mocket/default.nix index d5fe44b37e7..bba7b188417 100644 --- a/pkgs/development/python-modules/mocket/default.nix +++ b/pkgs/development/python-modules/mocket/default.nix @@ -5,7 +5,7 @@ , isPy3k , decorator , http-parser -, python_magic +, python-magic , urllib3 , pytestCheckHook , pytest-mock @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ decorator http-parser - python_magic + python-magic urllib3 ]; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 92338d92531..e697683b9b8 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -3,7 +3,7 @@ , fetchPypi , requests , websocket-client -, python_magic +, python-magic , cryptography , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; - propagatedBuildInputs = [ cryptography requests websocket-client python_magic ]; + propagatedBuildInputs = [ cryptography requests websocket-client python-magic ]; preCheck = '' export PUSHBULLET_API_KEY="" diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index 5baa9e90321..36e45d9d869 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -6,7 +6,7 @@ , httpretty , ijson , poetry-core -, python_magic +, python-magic , pytz , pytestCheckHook , requests-oauthlib @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli ijson - python_magic + python-magic pytz requests-oauthlib ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 597eb37c756..3185213123c 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python_magic }: +{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }: buildPythonPackage rec { pname = "relatorio"; @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ genshi lxml - python_magic + python-magic ]; meta = { diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 08d7f1046c7..81d80c8411d 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic ruamel-yaml unpaddedbase64 yarl diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 8c5310f6801..5d7550fe3cd 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonPackage rec { prometheus-client pycryptodome python-olm - python_magic + python-magic qrcode ruamel-yaml unpaddedbase64 diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index bb52507dbaa..2d0ab908cb8 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -44,7 +44,7 @@ in python.pkgs.buildPythonPackage rec { sqlalchemy CommonMark ruamel-yaml - python_magic + python-magic tulir-telethon telethon-session-sqlalchemy pillow diff --git a/pkgs/servers/pinnwand/steck.nix b/pkgs/servers/pinnwand/steck.nix index 52efdc148ab..de6f28f3090 100644 --- a/pkgs/servers/pinnwand/steck.nix +++ b/pkgs/servers/pinnwand/steck.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pkgs.git appdirs click - python_magic + python-magic requests termcolor toml diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 92fc69be7b5..a3f5c44781a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ argcomplete debian defusedxml jsondiff jsbeautifier libarchive-c - python_magic progressbar33 pypdf2 rpm tlsh + python-magic progressbar33 pypdf2 rpm tlsh ]) ++ lib.optionals stdenv.isLinux [ python3Packages.pyxattr acl cdrkit dtc ] ++ lib.optionals enableBloat ([ diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 88af5a13625..a73d39b5126 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python-magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; }; - propagatedBuildInputs = [ python_magic python-dateutil ]; + propagatedBuildInputs = [ python-magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix index 8116c222d07..2c584f35ff4 100644 --- a/pkgs/tools/security/hfinger/default.nix +++ b/pkgs/tools/security/hfinger/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ fnvhash - python_magic + python-magic ] ++ [ wireshark-cli ]; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 60775be180c..fdfab9bc195 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { defusedxml pyaml pykeepass - python_magic # similar API to "file-magic", but already in nixpkgs. + python-magic # similar API to "file-magic", but already in nixpkgs. secretstorage ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dcb33f7965..eb0062fa17c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 + python-magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 50ed104cbe8..3986a82fa89 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8360,7 +8360,7 @@ in { inherit (pkgs) lzo; }; - python_magic = callPackage ../development/python-modules/python-magic { }; + python-magic = callPackage ../development/python-modules/python-magic { }; python-manilaclient = callPackage ../development/python-modules/python-manilaclient { }; From 661cdae1b98076d7150ac12542ac075c85edb396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 01:19:54 +0200 Subject: [PATCH 037/108] python310Packages.python-magic: add SuperSandro2000 as maintainer --- pkgs/development/python-modules/python-magic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index 381ea671384..a9fa50a11c6 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { description = "A python interface to the libmagic file type identification library"; homepage = "https://github.com/ahupp/python-magic"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 57bce154f5becf2b43420179b0513de4af7f907c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 00:40:51 +0000 Subject: [PATCH 038/108] sqlfluff: 0.13.0 -> 0.13.1 --- pkgs/development/tools/database/sqlfluff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 79c31c1937f..fbb435128dd 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UFvrtLVHGlWUlvA7KLDgaCydE/UoxtYV+8RqLblOdns="; + hash = "sha256-hFpz2p8lJ4HpuSMZ8IDtqp2PIJFqEcelbYVAQpldu4o="; }; propagatedBuildInputs = with python3.pkgs; [ From 90fe3b144bcd2e05e1b44857e56d42340ea66a61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 00:48:01 +0000 Subject: [PATCH 039/108] babashka: 0.8.1 -> 0.8.2 --- pkgs/development/interpreters/clojure/babashka.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 1f663b5488d..b5ba81ebc28 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "babashka"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-9mh3ki6Q0vwlF+j4+UVznIhZ6Xleh7ChklJ5ojjGhYM="; + sha256 = "sha256-rdA/pV2EGYPs1UuuTq4dIuce3i8haJOyyyTDAWpOeR8="; }; executable = "bb"; From c70641c8d9aaeb8bbb8a759739646b262b77bbd2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 May 2022 18:31:40 +0000 Subject: [PATCH 040/108] =?UTF-8?q?rhythmbox:=203.4.4=20=E2=86=92=203.4.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/rhythmbox/-/compare/v3.4.4...v3.4.5 - Switched to Meson, which enabled all features by default. --- pkgs/applications/audio/rhythmbox/default.nix | 82 +++++++++++-------- 1 file changed, 46 insertions(+), 36 deletions(-) diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 2f35f1fe65c..0ba86567c7c 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -1,17 +1,30 @@ -{ lib, stdenv, fetchurl, pkg-config, fetchFromGitLab +{ stdenv +, lib +, fetchurl +, fetchpatch +, pkg-config +, meson +, ninja +, fetchFromGitLab , python3 -, perl -, perlPackages +, vala +, glib , gtk3 -, intltool , libpeas , libsoup +, libxml2 , libsecret , libnotify , libdmapsharing , gnome , gobject-introspection , totem-pl-parser +, libgudev +, libgpod +, libmtp +, lirc +, brasero +, grilo , tdb , json-glib , itstool @@ -19,38 +32,32 @@ , gst_all_1 , gst_plugins ? with gst_all_1; [ gst-plugins-good gst-plugins-ugly ] }: -let - # The API version of libdmapsharing required by rhythmbox 3.4.4 is 3.0. - - # This PR would solve the issue: - # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/12 - # Unfortunately applying this patch produces a rhythmbox which - # cannot fetch data from DAAP shares. - - libdmapsharing_3 = libdmapsharing.overrideAttrs (old: rec { - version = "2.9.41"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = old.pname; - rev = "${lib.toUpper old.pname}_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "05kvrzf0cp3mskdy6iv7zqq24qdczl800q2dn1h4bk3d9wchgm4p"; - }; - }); - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "rhythmbox"; - version = "3.4.4"; + version = "3.4.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "142xcvw4l19jyr5i72nbnrihs953pvrrzcbijjn9dxmxszbv03pf"; + sha256 = "l+u8YPN4sibaRbtEbYmQL26hgx4j8Q76ujZVk7HnTyo="; }; + patches = [ + # Fix stuff linking against rhythmdb not finding libxml headers + # included by rhythmdb.h header. + # https://gitlab.gnome.org/GNOME/rhythmbox/-/merge_requests/147 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/7e8c7b803a45b7badf350132f8e78e3d75b99a21.patch"; + sha256 = "5CE/NVlmx7FItNJCVQxx+x0DCYhUkAi/UuksfAiyWBg="; + }) + ]; + nativeBuildInputs = [ pkg-config - intltool perl perlPackages.XMLParser + meson + ninja + vala + glib itstool wrapGAppsHook ]; @@ -58,13 +65,20 @@ in stdenv.mkDerivation rec { buildInputs = [ python3 libsoup + libxml2 tdb json-glib + glib gtk3 libpeas totem-pl-parser - gnome.adwaita-icon-theme + libgudev + libgpod + libmtp + lirc + brasero + grilo gobject-introspection python3.pkgs.pygobject3 @@ -76,16 +90,14 @@ in stdenv.mkDerivation rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-libav - libdmapsharing_3 # necessary for daap support + libdmapsharing # for daap support libsecret libnotify ] ++ gst_plugins; - configureFlags = [ - "--enable-daap" - "--enable-libnotify" - "--with-libsecret" - ]; + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; preFixup = '' gappsWrapperArgs+=( @@ -93,8 +105,6 @@ in stdenv.mkDerivation rec { ) ''; - enableParallelBuilding = true; - passthru = { updateScript = gnome.updateScript { packageName = pname; From 1069f1d1a740e35f631ba4cd7e7e855b84535dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 03:28:43 +0200 Subject: [PATCH 041/108] python310Packages.xmltodict: adopt --- pkgs/development/python-modules/xmltodict/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 5e0733b6256..e0a9f4c5d73 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { description = "Makes working with XML feel like you are working with JSON"; homepage = "https://github.com/martinblech/xmltodict"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From bd037e7f3a4ee67016cca70711bf018652d76255 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 7 May 2022 09:42:55 +0800 Subject: [PATCH 042/108] brook: 20220406 -> 20220501 --- pkgs/tools/networking/brook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index df383409f4d..51ace3ac9a0 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "brook"; - version = "20220406"; + version = "20220501"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KCDXi86Wi01wEIJXPYYX5HkQMq7nKK2VhsN1x5yOvlk="; + sha256 = "sha256-JAlSqwhWsF8PTAyn2W1BCDO50eSBq7ukwl0dzzmK1zU="; }; vendorSha256 = "sha256-ic5QYRVElEuH4D29PXgTzMHU0KjrxDqcdfg7Kd37/YU="; From 4bdef23d6a0b1fb19c8ec7551467813fe74aca02 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 7 May 2022 09:46:33 +0800 Subject: [PATCH 043/108] cargo-expand: 1.0.16 -> 1.0.19 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 860d5371709..de75edf5e73 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.16"; + version = "1.0.19"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-NhBUN+pf+j/4IozFDEb+XZ1ijSk6dNvCANyez823a0c="; + sha256 = "sha256-+LKZ0pbSlqY8rbz96HZ59XYKsSJDMOrJMxblXNj74Yw="; }; - cargoSha256 = "sha256-7rqtxyoo1SQ7Rae04+b+B0JgCKeW0p1j7bZzPpJ8+ks="; + cargoSha256 = "sha256-ZEHc67jgLSZV6JH5/owAGTxxnbnYnx2fIUf0mQ14qvg="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 20ec825c44929f70d05c996289d80809d1ff7fbc Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 7 May 2022 09:41:47 +0800 Subject: [PATCH 044/108] eksctl: 0.95.0 -> 0.96.0 --- pkgs/tools/admin/eksctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 996ab16360b..de923d1f311 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.95.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-WAu2ghQAih+f1PdfflsroUOAV5Cs+hvECOyw34DRugU="; + sha256 = "sha256-AmwkWFhoGRBWrEhRlTRLGRu79ayWceszZi2hgx388Eg="; }; - vendorSha256 = "sha256-zedhE9WWCktqYig+bI4v9bQhzSW8laClgTI2Gsrz+FM="; + vendorSha256 = "sha256-akFclhx6c18u3z2oa6EvLd2NwkVCgJrYWv8Vbp1hZ9g="; doCheck = false; From 9669d16f9a471e442b9df38e01651a33058d92bb Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 6 May 2022 19:44:42 -0400 Subject: [PATCH 045/108] taplo-cli: 0.6.1 -> 0.6.2 --- pkgs/development/tools/taplo-cli/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/taplo-cli/default.nix b/pkgs/development/tools/taplo-cli/default.nix index 503be310966..0c584a36a52 100644 --- a/pkgs/development/tools/taplo-cli/default.nix +++ b/pkgs/development/tools/taplo-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "taplo-cli"; - version = "0.6.1"; + version = "0.6.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-0U7qoRnId3gKTQYPwbvrt/vzGfiSX6kcGwgRNc1uZ/I="; + sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY="; }; - cargoSha256 = "sha256-FIcq8wwJrZRxATDr+jo4KOX4l6auriNg+rSpMNsG+Tk="; + cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0="; - nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; + OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; + OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; - buildInputs = lib.optional stdenv.isLinux openssl - ++ lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin Security; meta = with lib; { description = "A TOML toolkit written in Rust"; From 18c337799397829017cb9aaa7e44cd9d5886f744 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 02:16:11 +0000 Subject: [PATCH 046/108] ffmpeg-normalize: 1.22.10 -> 1.23.0 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 4f77118c0a4..7f705bc3526 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.22.10"; + version = "1.23.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-F058lCuIxH0lqJlPrWIznu2Ks2w+KXrTnJD7CmYSZFU="; + sha256 = "sha256-DSBh3m7gGm5fWH47YWALlyhi4x6A2RcVrpuDDpXolSI="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; From 4655bf1cf480fcedff4a92cc474bd51e2a0a1d76 Mon Sep 17 00:00:00 2001 From: Oliver Evans Date: Fri, 6 May 2022 19:20:43 -0700 Subject: [PATCH 047/108] rust-analyzer: Update repo owner Project recently moved from github:rust-analyzer/rust-analyzer to github:rust-lang/rust-analyzer. See discussion in https://github.com/NixOS/nixpkgs/pull/171464. --- pkgs/development/tools/rust/rust-analyzer/default.nix | 2 +- pkgs/development/tools/rust/rust-analyzer/update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index c3c283db9b6..acacdcefb41 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-uZCUruIBTNTKYWYb8xQgJ6FsKlRi+Sh5n7m7aVk+hHQ="; src = fetchFromGitHub { - owner = "rust-analyzer"; + owner = "rust-lang"; repo = "rust-analyzer"; rev = version; sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA="; diff --git a/pkgs/development/tools/rust/rust-analyzer/update.sh b/pkgs/development/tools/rust/rust-analyzer/update.sh index 000a728a2b2..36c3fd3941b 100755 --- a/pkgs/development/tools/rust/rust-analyzer/update.sh +++ b/pkgs/development/tools/rust/rust-analyzer/update.sh @@ -3,7 +3,7 @@ # shellcheck shell=bash set -euo pipefail cd "$(dirname "$0")" -owner=rust-analyzer +owner=rust-lang repo=rust-analyzer nixpkgs=../../../../.. From 78b446e0aa538dd76a6cdbad0b377ae3df4e91fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 03:25:27 +0000 Subject: [PATCH 048/108] python310Packages.hahomematic: 1.2.2 -> 1.3.0 --- pkgs/development/python-modules/hahomematic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix index aef938e8266..879ffbf7123 100644 --- a/pkgs/development/python-modules/hahomematic/default.nix +++ b/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "1.2.2"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-eXJXKWlvNJIqEJY5WE5Wbk9BdGu9N9xhintJbdSkJrQ="; + sha256 = "sha256-033iPQfFF26Ly8OVdjExDZDoQ35DXuVF7dXqokA7k/s="; }; propagatedBuildInputs = [ From c489ec67bfb933856bd5e7ce8d3f99fa82800fd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 04:06:21 +0000 Subject: [PATCH 049/108] python310Packages.trimesh: 3.11.2 -> 3.12.0 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c3a6a4af9e5..315678b874e 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.11.2"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7booFScN2qNqldPdBmxH1pTUz2+u7JMmPmX0tJojaeI="; + sha256 = "sha256-RcRFF5vIMOQsPXbd2g8DSnOrWnpLLNe3Sa8PqAdwFvU="; }; propagatedBuildInputs = [ numpy ]; From 1b7407f8a13834b0a0769964661d1869254d5903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 04:14:48 +0000 Subject: [PATCH 050/108] python310Packages.mypy-boto3-s3: 1.22.6 -> 1.22.8 --- pkgs/development/python-modules/mypy-boto3-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/pkgs/development/python-modules/mypy-boto3-s3/default.nix index a329d5ab9e5..6fa1728deea 100644 --- a/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.22.6"; + version = "1.22.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-b+Rf7mYifN5KXAECg7goCDlD/S1W7sTh06In1mp4NR4="; + hash = "sha256-Br7HlymKuQUbI+iw90HWi1lSnEFwQbziBLokAHTzGEk="; }; propagatedBuildInputs = [ From d91435f85b231c8faff411829db86079849a557a Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Sat, 7 May 2022 08:02:13 +0300 Subject: [PATCH 051/108] maintainers: add alexshpilkin --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a743e2cc064..80a62e0c861 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -513,6 +513,17 @@ github = "alexnortung"; githubId = 1552267; }; + alexshpilkin = { + email = "ashpilkin@gmail.com"; + github = "alexshpilkin"; + githubId = 1010468; + keys = [{ + longkeyid = "rsa4096/0x73E9AA114B3A894B"; + fingerprint = "B595 D74D 6615 C010 469F 5A13 73E9 AA11 4B3A 894B"; + }]; + matrix = "@alexshpilkin:matrix.org"; + name = "Alexander Shpilkin"; + }; alexvorobiev = { email = "alexander.vorobiev@gmail.com"; github = "alexvorobiev"; From 60ad3e3bb19ea76268d928909e44de5825f8e23b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 05:05:11 +0000 Subject: [PATCH 052/108] python310Packages.yte: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/yte/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/yte/default.nix b/pkgs/development/python-modules/yte/default.nix index 7a7132a8326..7457cc14f31 100644 --- a/pkgs/development/python-modules/yte/default.nix +++ b/pkgs/development/python-modules/yte/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "yte"; - version = "1.2.2"; + version = "1.2.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "koesterlab"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-x0CmPiV/6zTnawPW9lgrZ9NsUhmK8fhafwqOP9o3Mdc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-xu88zupT0/kIzTd56IbKYKBM5+EDI1d+QIEq8zOBWWo="; }; nativeBuildInputs = [ From 1532844bcfc507b81a92104321aa11bfc7cab486 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Sat, 7 May 2022 08:11:14 +0300 Subject: [PATCH 053/108] facetimehd-calibration: add alexshpilkin as maintainer --- .../linux/firmware/facetimehd-calibration/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix index 5152b3dfe71..86a3924c0e2 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-calibration/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { description = "facetimehd calibration"; homepage = "https://support.apple.com/kb/DL1837"; license = licenses.unfree; - maintainers = with maintainers; [ womfoo grahamc ]; + maintainers = with maintainers; [ alexshpilkin womfoo grahamc ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; From 98912aaadfbe51243925beb53597df2459becae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 May 2022 05:08:04 +0000 Subject: [PATCH 054/108] python3Packages.async-lru: unstable-2022-02-03 -> 1.0.3 --- .../python-modules/async-lru/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/async-lru/default.nix b/pkgs/development/python-modules/async-lru/default.nix index 69e6519b32c..b656b194785 100644 --- a/pkgs/development/python-modules/async-lru/default.nix +++ b/pkgs/development/python-modules/async-lru/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "async-lru"; - version = "unstable-2022-02-03"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = "async-lru"; - rev = "3574af7691371015c47faf77e0abf8c7b06a3cdc"; - hash = "sha256-EsadpQlRNnebp0UUybzQwzyK4zwFlortutv3VTUsprU="; + rev = "v${version}"; + hash = "sha256-98ZPFSOFRnymTCfCG9OuajfxXAWyCrByyJEHhpPVPbM="; }; postPatch = '' @@ -32,13 +32,6 @@ buildPythonPackage rec { "--asyncio-mode=strict" ]; - disabledTests = [ - # https://github.com/aio-libs/async-lru/issues/341 - "test_alru_cache_deco" - "test_alru_cache_fn_called" - "test_close" - ]; - pythonImportsCheck = [ "async_lru" ]; meta = with lib; { From 94c97dfa94876f455c3eacd48ae1a9d0b24d5daa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 30 Apr 2022 07:58:28 +0200 Subject: [PATCH 055/108] =?UTF-8?q?coqPackages.QuickChick:=201.5.0=20?= =?UTF-8?q?=E2=86=92=201.6.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/QuickChick/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 56ce94ecc6f..db3227c1770 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,11 +1,12 @@ { lib, mkCoqDerivation, coq, ssreflect, coq-ext-lib, simple-io, version ? null }: let recent = lib.versions.isGe "8.7" coq.coq-version; in -mkCoqDerivation { +(mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; inherit version; defaultVersion = with lib; with versions; lib.switch [ coq.coq-version ssreflect.version ] [ + { cases = [ (isGe "8.13") pred.true ]; out = "1.6.2"; } { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; } @@ -16,6 +17,7 @@ mkCoqDerivation { { cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.5" pred.true ]; out = "20170512"; } ] null; + release."1.6.2".sha256 = "0g5q9zw3xd4zndihq96nxkq4w3dh05418wzlwdk1nnn3b6vbx6z0"; release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw"; release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; @@ -46,4 +48,11 @@ mkCoqDerivation { description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; }; -} +}).overrideAttrs (o: + let after_1_6 = lib.versions.isGe "1.6" o.version || o.version == "dev"; + in { + nativeBuildInputs = o.nativeBuildInputs + ++ lib.optional after_1_6 coq.ocamlPackages.cppo; + propagatedBuildInputs = o.propagatedBuildInputs + ++ lib.optionals after_1_6 (with coq.ocamlPackages; [ findlib zarith ]); +}) From d317484de16e4446c2771826c6eb1d853eb0297d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:17 +0200 Subject: [PATCH 056/108] coqPackages.graph-theory: enable for Coq 8.15 --- pkgs/development/coq-modules/graph-theory/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix index eedbe6fb5d8..9ba5f03a562 100644 --- a/pkgs/development/coq-modules/graph-theory/default.nix +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.13" "8.14"; out = "0.9"; } + { case = range "8.13" "8.15"; out = "0.9"; } ] null; propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap mathcomp-fingroup hierarchy-builder ]; From 4847e4382c9ae9691bf1f20d32c4c64c44a7e3b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:25 +0200 Subject: [PATCH 057/108] coqPackages.category-theory: enable with Coq 8.15 --- pkgs/development/coq-modules/category-theory/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index ae3f7e809fb..7cff9ddef4b 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -16,7 +16,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "20211213"; } + { case = range "8.10" "8.15"; out = "20211213"; } { case = range "8.8" "8.9"; out = "20190414"; } { case = range "8.6" "8.7"; out = "20180709"; } ] null; From e9d3fe8f289627ed3f224339241d7317675effc2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:30 +0200 Subject: [PATCH 058/108] coqPackages.goedel: enable with Coq 8.15 --- pkgs/development/coq-modules/goedel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/goedel/default.nix b/pkgs/development/coq-modules/goedel/default.nix index c50f8672e01..ecd154c82ed 100644 --- a/pkgs/development/coq-modules/goedel/default.nix +++ b/pkgs/development/coq-modules/goedel/default.nix @@ -12,7 +12,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.11" "8.14"; out = "8.13.0"; } + { case = range "8.11" "8.15"; out = "8.13.0"; } ] null; propagatedBuildInputs = [ hydra-battles pocklington ]; From f393892bb369a73ff655d7336369d43fd45f06ff Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:33 +0200 Subject: [PATCH 059/108] coqPackages.smtcoq: disable for Coq > 8.13 --- pkgs/development/coq-modules/smtcoq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/smtcoq/default.nix b/pkgs/development/coq-modules/smtcoq/default.nix index 416b8d1bb58..0389b45fb5c 100644 --- a/pkgs/development/coq-modules/smtcoq/default.nix +++ b/pkgs/development/coq-modules/smtcoq/default.nix @@ -9,8 +9,8 @@ mkCoqDerivation { release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; inherit version; - defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (isGe "8.13") ]; out = "itp22"; } + defaultVersion = with versions; switch coq.version [ + { case = isEq "8.13"; out = "itp22"; } ] null; propagatedBuildInputs = [ trakt cvc4 ] ++ lib.optionals (!stdenv.isDarwin) [ veriT ]; From e34f56ce98a9cfbea6703e65dd96fa7fa09fc91c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:36 +0200 Subject: [PATCH 060/108] coqPackages.itauto: init at 8.14.0 & 8.15.0 --- pkgs/development/coq-modules/itauto/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix index af535993362..4993a76b4f0 100644 --- a/pkgs/development/coq-modules/itauto/default.nix +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -6,9 +6,13 @@ mkCoqDerivation rec { owner = "fbesson"; domain = "gitlab.inria.fr"; + release."8.15.0".sha256 = "sha256:10qpv4nx1p0wm9sas47yzsg9z22dhvizszfa21yff08a8fr0igya"; + release."8.14.0".sha256 = "sha256:1k6pqhv4dwpkwg81f2rlfg40wh070ks1gy9r0ravm2zhsbxqcfc9"; release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; inherit version; defaultVersion = with versions; switch coq.coq-version [ + { case = isEq "8.15"; out = "8.15.0"; } + { case = isEq "8.14"; out = "8.14.0"; } { case = isEq "8.13"; out = "8.13+no"; } ] null; From 7711b57784a0ef0e027f9bd465155a704810ec6a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:39 +0200 Subject: [PATCH 061/108] coqPackages.smpl: init at 8.14 & 8.15 --- pkgs/development/coq-modules/smpl/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/coq-modules/smpl/default.nix b/pkgs/development/coq-modules/smpl/default.nix index 63bed38ead9..f03065cf045 100644 --- a/pkgs/development/coq-modules/smpl/default.nix +++ b/pkgs/development/coq-modules/smpl/default.nix @@ -8,10 +8,14 @@ mkCoqDerivation { release."8.10.2".sha256 = "sha256-TUfTZKBgrSOT6piXRViHSGPE9NSj3bGx2XBIw6YCcEs="; release."8.12".sha256 = "sha256-UQbDHLVBKYk++o+Y2B6ARYRYGglytsnXhguwMatjOHg="; release."8.13".sha256 = "sha256-HxQBaIE2CjyfG4GoIXprfehqjsr/Z74YdodxMmrbzSg="; + release."8.14".sha256 = "sha256:0wmrc741j67ch4rkygjkrz5i9afi01diyyj69i24cmasvx4wad38"; + release."8.15".sha256 = "sha256:0m9xlkdhilvqb0v4q9c4hzfwffbccd6029ks39xg7qbiq6zklpvp"; releaseRev = v: "v${v}"; inherit version; defaultVersion = with versions; switch coq.version [ + { case = isEq "8.15"; out = "8.15"; } + { case = isEq "8.14"; out = "8.14"; } { case = "8.13.2"; out = "8.13"; } { case = "8.12.2"; out = "8.12"; } { case = "8.10.2"; out = "8.10.2"; } From a1cb58e4cfcd499fd08a398ba3011e223040b744 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:42 +0200 Subject: [PATCH 062/108] coqPackages.semantics: enable with Coq 8.15 --- pkgs/development/coq-modules/semantics/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/semantics/default.nix b/pkgs/development/coq-modules/semantics/default.nix index 89567d401b2..e112512ec5c 100644 --- a/pkgs/development/coq-modules/semantics/default.nix +++ b/pkgs/development/coq-modules/semantics/default.nix @@ -16,7 +16,7 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = range "8.10" "8.14"; out = "8.14.0"; } + { case = range "8.10" "8.15"; out = "8.14.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } From 38dc75293de6fab9620a736962f0177bc049af8c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:45 +0200 Subject: [PATCH 063/108] coqPackages.mathcomp-tarjan: enable with Coq 8.15 --- pkgs/development/coq-modules/mathcomp-tarjan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix index 6f82532ada3..35e9398f3ad 100644 --- a/pkgs/development/coq-modules/mathcomp-tarjan/default.nix +++ b/pkgs/development/coq-modules/mathcomp-tarjan/default.nix @@ -9,7 +9,7 @@ with lib; mkCoqDerivation { inherit version; defaultVersion = with versions; switch [ coq.version mathcomp-ssreflect.version ] [{ - cases = [ (range "8.10" "8.14") (isGe "1.12.0") ]; out = "1.0.0"; + cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.0.0"; }] null; release."1.0.0".sha256 = "sha256:0r459r0makshzwlygw6kd4lpvdjc43b3x5y9aa8x77f2z5gymjq1"; From a7241ea207b603f3d3515b45600c3747c71bc39c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 7 May 2022 07:29:49 +0200 Subject: [PATCH 064/108] coq: default to 8.15 --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/coq-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae0c1c4f803..e9e2529e19b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12375,7 +12375,7 @@ with pkgs; comby = callPackage ../development/tools/comby { }; - compcert = coqPackages.compcert.override { version = "3.9"; }; + inherit (coqPackages) compcert; computecpp-unwrapped = callPackage ../development/compilers/computecpp {}; computecpp = wrapCCWith rec { diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6af05d761c4..9c3e666c5b3 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -160,7 +160,7 @@ in rec { coqPackages_8_13 = mkCoqPackages coq_8_13; coqPackages_8_14 = mkCoqPackages coq_8_14; coqPackages_8_15 = mkCoqPackages coq_8_15; - coqPackages = recurseIntoAttrs coqPackages_8_13; + coqPackages = recurseIntoAttrs coqPackages_8_15; coq = coqPackages.coq; } From 71f10994f2ba24a6069f4c7076097a27c3b91fcb Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 07:36:11 +0100 Subject: [PATCH 065/108] simh: add -fcommon workaround Without the change -fno-common toolchains like upstream gcc-10 or clang-11+ fail to build simh as: $ nix build --impure --expr 'with import ~/nm {}; simh.override { stdenv = clang13Stdenv; }' ... ld: /build/pdp11_io-0c74f0.o:(.bss+0x10c00): multiple definition of `uc15_memsize'; /build/pdp11_cis-17339e.o:(.bss+0x118): first defined here ld: /build/pdp11_io_lib-296a06.o:(.bss+0x8000): multiple definition of `uc15_memsize'; /build/pdp11_cis-17339e.o:(.bss+0x118): first defined here --- pkgs/applications/emulators/simh/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/emulators/simh/default.nix b/pkgs/applications/emulators/simh/default.nix index 1e939538cda..6f3409ec063 100644 --- a/pkgs/applications/emulators/simh/default.nix +++ b/pkgs/applications/emulators/simh/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { dontConfigure = true; + # Workaround to build against upstream gcc-10 and clang-11. + # Can be removed when next release contains + # https://github.com/simh/simh/issues/794 + NIX_CFLAGS_COMPILE = [ "-fcommon" ]; + makeFlags = [ "GCC=${stdenv.cc.targetPrefix}cc" "CC_STD=-std=c99" "LDFLAGS=-lm" ]; preInstall = '' From c00d014a15cf005efd5388540f829438b4bc6aa1 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sat, 7 May 2022 00:00:09 +0300 Subject: [PATCH 066/108] catclock: 2015-10-04 -> 2021-11-15 --- pkgs/applications/misc/catclock/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index fff8101e55a..494ed3001e5 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, xlibsWrapper, motif }: +{ stdenv, lib, fetchFromGitHub, xlibsWrapper, motif +, withAudioTracking ? false, libpulseaudio, aubio }: stdenv.mkDerivation { pname = "catclock"; - version = "unstable-2015-10-04"; + version = "unstable-2021-11-15"; src = fetchFromGitHub { owner = "BarkyTheDog"; repo = "catclock"; - rev = "d20b8825b38477a144e8a2a4bbd4779adb3620ac"; - sha256 = "0fiv9rj8p8mifv24cxljdrrmh357q70zmzdci9bpbxnhs1gdpr63"; + rev = "b2f277974b5a80667647303cabf8a89d6d6a4290"; + sha256 = "0ls02j9waqg155rj6whisqm7ppsdabgkrln92n4rmkgnwv25hdbi"; }; preInstall = '' @@ -17,14 +18,15 @@ stdenv.mkDerivation { cp xclock.man $out/share/man/man1/xclock.1 ''; - makeFlags = [ - "DESTINATION=$(out)/bin/" - ]; + makeFlags = [ "DESTINATION=$(out)/bin/" ] + ++ lib.optional withAudioTracking "WITH_TEMPO_TRACKER=1"; - buildInputs = [ xlibsWrapper motif ]; + buildInputs = [ xlibsWrapper motif ] + ++ lib.optionals withAudioTracking [ libpulseaudio aubio ]; meta = with lib; { homepage = "http://codefromabove.com/2014/05/catclock/"; + description = "Analog / Digital / Cat clock for X"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; mainProgram = "xclock"; From fa03d60746ae10a6149196bc08d90f8bf39c2ff1 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sat, 7 May 2022 08:52:40 +0200 Subject: [PATCH 067/108] python3Packages.nutils: fix test issues Signed-off-by: Florian Brandes --- .../python-modules/nutils/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 88486910796..9e42027ac2e 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,15 +1,18 @@ -{ lib, python, buildPythonPackage, fetchPypi, numpy, treelog, stringly, coverage }: +{ lib, buildPythonPackage, fetchFromGitHub, numpy, treelog, stringly, pytestCheckHook, pythonOlder }: buildPythonPackage rec { pname = "nutils"; version = "7.0"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - sha256 = "1sw310l2yb8wbcv2qhik8s928zjh2syzz2qxisglbzski9qdw2x6"; + src = fetchFromGitHub { + owner = "evalf"; + repo = "nutils"; + rev = "refs/tags/v${version}"; + hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; }; - pythonImportChecks = [ "nutils" ]; + pythonImportsCheck = [ "nutils" ]; propagatedBuildInputs = [ numpy @@ -17,11 +20,13 @@ buildPythonPackage rec { stringly ]; - checkInputs = [ coverage ]; + checkInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ + # AttributeError: type object 'setup' has no attribute '__code__' + "tests/test_cli.py" + ]; - checkPhase = '' - ${python.interpreter} -m unittest - ''; meta = with lib; { description = "Numerical Utilities for Finite Element Analysis"; From b0c03acd183ba00ca6145acfb89eff306dd59995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 May 2022 07:34:12 +0000 Subject: [PATCH 068/108] python3Packages.py-nextbusnext: init at 0.1.5 --- .../python-modules/py-nextbusnext/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/py-nextbusnext/default.nix diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix new file mode 100644 index 00000000000..3b6d24d6168 --- /dev/null +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "py-nextbusnext"; + version = "0.1.5"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ViViDboarder"; + repo = "py_nextbus"; + rev = "v${version}"; + hash = "sha256-uUHA8v5iTISmPaTgk0RvcLLRM34f3JXUjZClKGXdMoI="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "py_nextbus" ]; + + meta = { + description = "Minimalistic Python client for the NextBus public API"; + homepage = "https://github.com/ViViDboarder/py_nextbus"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3986a82fa89..9b3942d7e98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6369,6 +6369,8 @@ in { proxy_tools = callPackage ../development/python-modules/proxy_tools { }; + py-nextbusnext = callPackage ../development/python-modules/py-nextbusnext { }; + pyaehw4a1 = callPackage ../development/python-modules/pyaehw4a1 { }; pyatag = callPackage ../development/python-modules/pyatag { }; From ecb61e6ff62de07d84a63383c67c0bdd442291d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 May 2022 07:35:26 +0000 Subject: [PATCH 069/108] home-assistant: support nextbus component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d91ad268c9a..afed37e315d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -1753,7 +1753,8 @@ nexia ]; "nextbus" = ps: with ps; [ - ]; # missing inputs: py_nextbusnext + py-nextbusnext + ]; "nextcloud" = ps: with ps; [ nextcloudmonitor ]; @@ -3501,6 +3502,7 @@ "netgear" "network" "nexia" + "nextbus" "nightscout" "nina" "no_ip" From 0eb15b8fd8e3c2ba4869ddf65595b3fe94d8adcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 7 May 2022 07:40:56 +0000 Subject: [PATCH 070/108] python3Packages.contexttimer: fix typo --- pkgs/development/python-modules/contexttimer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index 02aeec5bfcc..7cf41e9fcbd 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { }) ]; - pythonImportCheck = [ "contexttimer" ]; + pythonImportsCheck = [ "contexttimer" ]; checkInputs = [ mock ]; From 056d3bb4ac3bcfeb710b5dfba7bed01968667360 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 07:49:17 +0000 Subject: [PATCH 071/108] python310Packages.snapcast: 2.1.3 -> 2.2.0 --- pkgs/development/python-modules/snapcast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 95d162b7f32..e2ee8b983ce 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.1.3"; + version = "2.2.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "happyleavesaoc"; repo = "python-snapcast"; - rev = version; - sha256 = "1jigdccdd7bffszim942mxcwxyznfjx7y3r5yklz3psl7zgbzd6c"; + rev = "refs/tags/${version}"; + sha256 = "sha256-H41X5bfRRu+uE7eUsmUkONm6hugNs43+O7MvVPH0e+8="; }; propagatedBuildInputs = [ From 7b71709dcaa4847367f60621e5bedd766a01d74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 06:32:35 +0000 Subject: [PATCH 072/108] python3Packages.imap-tools: 0.54.0 -> 0.55.0 https://github.com/ikvk/imap_tools/releases/tag/v0.55.0 --- pkgs/development/python-modules/imap-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index a63754f0c09..404731e22a9 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "0.54.0"; + version = "0.55.0"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ikvk"; repo = "imap_tools"; rev = "v${version}"; - hash = "sha256-RiKGxyCPYlAJ5YbxvEKxCYgUg1D9s29YSCT4tY3FIEE="; + hash = "sha256-Jtuw0pYkgR1wrqPlEBOpia1rFU/+MLadOFEm2xLIFMw="; }; checkInputs = [ From 6c3425e2439a1c31cff63dbf312bca4e113b373e Mon Sep 17 00:00:00 2001 From: Daniel Ebbert Date: Sat, 7 May 2022 11:17:42 +0200 Subject: [PATCH 073/108] calibre: 5.37.0 -> 5.42.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8f672deb693..753be1eb88c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "calibre"; - version = "5.37.0"; + version = "5.42.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY="; + hash = "sha256-pob9GZl3Wiky5aMGGvcNQdDrKh19bo+n5ihdS45X+Vg="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 From 6f44ed8857f4df690907deb81798feb13c74894f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 May 2022 01:29:22 +0000 Subject: [PATCH 074/108] =?UTF-8?q?gnome.gnome-shell:=2042.0=20=E2=86=92?= =?UTF-8?q?=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/42.0...42.1 --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 1ad36f7e96b..e3b8d6c344d 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "M9QE+zyTud5CmE8BEKKWnWpKckfCf+f14kxn7P7HUJQ="; + sha256 = "9e6KYVj6EiYnQScmy4gATn4tBGrcMiFQViROWbdAY+o="; }; patches = [ From d9fed886f308001ad4fef6d8df03e4a07975282d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 May 2022 01:29:22 +0000 Subject: [PATCH 075/108] =?UTF-8?q?gnome.gnome-shell-extensions:=2042.0=20?= =?UTF-8?q?=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/compare/42.0...42.1 --- pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 1083fe11106..2815c3d53ea 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "42.0"; + version = "42.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "PuZbdbGv2LzKCioD2psohHh+1A4leogdmqbvfIcnYC8="; + sha256 = "LYjv61d+2viqrkMcd5um5uuWHuvd8FzKLsyhqgTbekA="; }; patches = [ From 17b0f145a3771391ed2b2b2daf19f2846754f9f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 May 2022 01:29:40 +0000 Subject: [PATCH 076/108] =?UTF-8?q?gnome.mutter:=2042.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/mutter/-/compare/42.0...42.1 --- pkgs/desktops/gnome/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix index f92b162476a..415fd7b80c9 100644 --- a/pkgs/desktops/gnome/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -47,13 +47,13 @@ let self = stdenv.mkDerivation rec { pname = "mutter"; - version = "42.0"; + version = "42.1"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0eJARGt/jNij/52q4zbByQFhk7p+B2nHml5sA4SQIuU="; + sha256 = "cZQhi/7EW5o+/avOb4RQ7Uw5dyIaHqQBTC5Fii/poVQ="; }; patches = [ From fab6e2617d5ead762298e9d7125ba1f967cee7cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 11:51:17 +0200 Subject: [PATCH 077/108] python310Packages.snapcast: disable on older Python releases --- pkgs/development/python-modules/snapcast/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index e2ee8b983ce..7e7491fe8b6 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -2,20 +2,22 @@ , buildPythonPackage , construct , fetchFromGitHub -, isPy3k , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "snapcast"; version = "2.2.0"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - sha256 = "sha256-H41X5bfRRu+uE7eUsmUkONm6hugNs43+O7MvVPH0e+8="; + hash = "sha256-H41X5bfRRu+uE7eUsmUkONm6hugNs43+O7MvVPH0e+8="; }; propagatedBuildInputs = [ @@ -26,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "snapcast" ]; + pythonImportsCheck = [ + "snapcast" + ]; meta = with lib; { description = "Control Snapcast, a multi-room synchronous audio solution"; From 21e9ee96a3c22fb5274d43c5e5b8958660c048a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 09:55:22 +0000 Subject: [PATCH 078/108] python310Packages.aws-adfs: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/aws-adfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 9f4a6dcb45a..c888a99f264 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aws-adfs"; - version = "2.0.2"; + version = "2.0.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "venth"; repo = pname; - rev = version; - hash = "sha256-T3AmPCOSeu7gvl57aHjnviy5iQAKlWy85fUOVecFRFc="; + rev = "refs/tags/${version}"; + hash = "sha256-/cOJ8k8YuwTGEXrNuPFAYvDyDKERMJf3o3nRkDLkrJE="; }; nativeBuildInputs = [ From 65401d1b9fcc6f327b1c6b661fe99bb81b024b0b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Fri, 6 May 2022 23:49:17 -0700 Subject: [PATCH 079/108] uncrustify: 0.74.0 -> 0.75.0 --- pkgs/development/tools/misc/uncrustify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 3c191d7c6a9..e8020787130 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.74.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "0v48vhmzxjzysbf0vhxzayl2pkassvbabvwg84xd6b8n5i74ijxd"; + sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg="; }; nativeBuildInputs = [ cmake python3 ]; From 2700dc9e8e6745d557f47a955f8ca3be33798b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 10:15:47 +0000 Subject: [PATCH 080/108] python310Packages.azure-mgmt-recoveryservicesbackup: 4.1.1 -> 4.2.0 --- .../azure-mgmt-recoveryservicesbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 5baf84c1c39..564954af764 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-9xF2TIAzydmviOwfveA0ZGP7Qj0HWLL6rXp4V4IDS6A="; + sha256 = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; }; propagatedBuildInputs = [ From 4bc4e82021b61c54115108ce8ac8301d4253102e Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 23 Apr 2022 05:41:03 -0400 Subject: [PATCH 081/108] python3Packages.hatch-vcs: init at 0.2.0 --- .../python-modules/hatch-vcs/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/hatch-vcs/default.nix diff --git a/pkgs/development/python-modules/hatch-vcs/default.nix b/pkgs/development/python-modules/hatch-vcs/default.nix new file mode 100644 index 00000000000..6e785d0c9a2 --- /dev/null +++ b/pkgs/development/python-modules/hatch-vcs/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +, git +, hatchling +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "hatch-vcs"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "hatch_vcs"; + inherit version; + sha256 = "sha256-mRPXM7NO7JuwNF0GJsoyFlpK0t4V0c5kPDbQnKkIq/8="; + }; + + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + hatchling + setuptools-scm + ]; + + checkInputs = [ + git + pytestCheckHook + ]; + + pythonImportsCheck = [ + "hatch_vcs" + ]; + + meta = with lib; { + description = "A plugin for Hatch that uses your preferred version control system (like Git) to determine project versions"; + homepage = "https://github.com/ofek/hatch-vcs"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b3942d7e98..0fd04a7ff14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3792,6 +3792,8 @@ in { hatchling = callPackage ../development/python-modules/hatchling { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; + haversine = callPackage ../development/python-modules/haversine { }; hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; From 205f6c6023b1d7cf5b4e5c240afd043ef90e35d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 10:47:22 +0000 Subject: [PATCH 082/108] python310Packages.holoviews: 1.14.8 -> 1.14.9 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 18a5f0cd82a..e1ad9ee1123 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.8"; + version = "1.14.9"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bDZVmaLLFnk7tifJtcVDCYK7WRyd6IhQAv+RtTm2ETM="; + sha256 = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo="; }; propagatedBuildInputs = [ From 22898dff8cdc8e9f457a1d97bd6c5dc274a2a0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Sat, 7 May 2022 12:05:40 +0100 Subject: [PATCH 083/108] pythonPackages.python-magic: Fix typo in alias Fixes regression introduced by #171879 --- pkgs/top-level/python-aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index eb0062fa17c..385bf1142b3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,7 +108,7 @@ mapAliases ({ pytestrunner = pytest-runner; # added 2021-01-04 python-igraph = igraph; # added 2021-11-11 python-lz4 = lz4; # added 2018-06-01 - python-magic = python-magic; # added 2022-05-07 + python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 From 47bed4ae046a397b06318cc6ca2cfdfdf0bd7b06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 13:23:18 +0200 Subject: [PATCH 084/108] prospector: 1.5.1 -> 1.7.7 --- pkgs/development/tools/prospector/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 2f58737637f..0d6e5de4cfe 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -11,20 +11,22 @@ with python3.pkgs; buildPythonApplication rec { pname = "prospector"; - version = "1.5.1"; + version = "1.7.7"; format = "pyproject"; + disabled = pythonOlder "3.6.1"; src = pkgs.fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = version; - sha256 = "17f822cxrvcvnrzdx1a9fyi9afljq80b6g6z1k2bqa1vs21gwv7l"; + hash = "sha256-sbPZmVeJtNphtjuZEfKcUgty9bJ3E/2Ya9RuX3u/XEs="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' + --replace 'pep8-naming = ">=0.3.3,<=0.10.0"' 'pep8-naming = "*"' \ + --replace 'mccabe = "^0.6.0"' 'mccabe = "*"' ''; nativeBuildInputs = [ @@ -61,9 +63,7 @@ buildPythonApplication rec { meta = with lib; { description = "Tool to analyse Python code and output information about errors, potential problems, convention violations and complexity"; homepage = "https://github.com/PyCQA/prospector"; - license = licenses.gpl2; - maintainers = with maintainers; [ - kamadorueda - ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ kamadorueda ]; }; } From 27b8af8d1c2dc408656e0301932f1e6c69991779 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 09:04:08 +0100 Subject: [PATCH 085/108] netatalk: 3.1.12 -> 3.1.13 Without the update build fails on -fno-common toolchains as: $ nix build --impure --expr 'with import ./. {}; netatalk.override { stdenv = clang13Stdenv; }' -L ... ld: afpd-volume.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: multiple definition of `invalid_dircache_entries'; afpd-afp_dsi.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: first defined here ld: afpd-acls.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: multiple definition of `invalid_dircache_entries'; afpd-afp_dsi.o:/build/netatalk-3.1.12/etc/afpd/./directory.h:94: first defined here Changes: https://netatalk.sourceforge.io/3.1/ReleaseNotes3.1.13.html --- pkgs/tools/filesystems/netatalk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index e5e873b9ac5..f5eb62cca56 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "netatalk"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${version}.tar.bz2"; - sha256 = "1ld5mnz88ixic21m6f0xcgf8v6qm08j6xabh1dzfj6x47lxghq0m"; + sha256 = "0pg0slvvvq3l6f5yjz9ybijg4i6rs5a6c8wcynaasf8vzsyadbc9"; }; patches = [ From a2e220cd65480b2d9e8e6e6bc570d7229115aa0b Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Fri, 6 May 2022 00:22:46 -0700 Subject: [PATCH 086/108] dieharder: init at 3.31.1 --- pkgs/tools/security/dieharder/default.nix | 31 ++++++++++++++++++++++ pkgs/tools/security/dieharder/stdint.patch | 10 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 43 insertions(+) create mode 100644 pkgs/tools/security/dieharder/default.nix create mode 100644 pkgs/tools/security/dieharder/stdint.patch diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix new file mode 100644 index 00000000000..fc78f7c2137 --- /dev/null +++ b/pkgs/tools/security/dieharder/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenv, fetchurl, gsl +, dieharder, testers }: + +stdenv.mkDerivation rec { + pname = "dieharder"; + version = "3.31.1"; + + src = fetchurl { + url = "http://webhome.phy.duke.edu/~rgb/General/dieharder/dieharder-${version}.tgz"; + hash = "sha256-bP8P+DlMVTVJrHQzNZzPyVX7JnlCYDFGIN+l5M1Lcn8="; + }; + + patches = [ + # Include missing stdint.h header + ./stdint.patch + ]; + + buildInputs = [ gsl ]; + + passthru = { + tests.version = testers.testVersion { package = dieharder; }; + }; + + meta = with lib; { + description = "A Random Number Generator test suite"; + homepage = "https://webhome.phy.duke.edu/~rgb/General/dieharder.php"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ zhaofengli ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/dieharder/stdint.patch b/pkgs/tools/security/dieharder/stdint.patch new file mode 100644 index 00000000000..91dccfafd66 --- /dev/null +++ b/pkgs/tools/security/dieharder/stdint.patch @@ -0,0 +1,10 @@ +--- a/include/dieharder/libdieharder.h 2011-10-14 15:41:37.000000000 +0200 ++++ b/include/dieharder/libdieharder.h 2015-03-27 16:34:40.978860858 +0100 +@@ -13,6 +13,7 @@ + #include + #include + #include ++#include + #include + + /* This turns on uint macro in c99 */ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae0c1c4f803..2ca2700bb3f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3254,6 +3254,8 @@ with pkgs; dibbler = callPackage ../tools/networking/dibbler { }; + dieharder = callPackage ../tools/security/dieharder { }; + diesel-cli = callPackage ../development/tools/diesel-cli { inherit (darwin.apple_sdk.frameworks) Security; }; From f1801888282556727785eef66fb3f965a8e713ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EF=BD=88=EF=BD=89=EF=BD=8C=EF=BD=8A=EF=BD=95=EF=BD=93?= =?UTF-8?q?=EF=BD=94=EF=BD=89?= Date: Fri, 6 May 2022 23:48:07 -0700 Subject: [PATCH 087/108] sigi: 3.2.1 -> 3.3.0 --- pkgs/applications/misc/sigi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sigi/default.nix b/pkgs/applications/misc/sigi/default.nix index ff74d8b098f..e3384ff6dd7 100644 --- a/pkgs/applications/misc/sigi/default.nix +++ b/pkgs/applications/misc/sigi/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "sigi"; - version = "3.2.1"; + version = "3.3.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1eZ6i0CvjNyYlWb7c0OPlGtvVSFpi8hiOl/7qeeE9wA="; + sha256 = "sha256-dcfzCac4dT2X1hgTSh30G7h2XtvVj1jMUmrUzqZ11y8="; }; - cargoSha256 = "sha256-Tyrcu/BYt9k4igiEIiZ2I7VIGiBZ3D2i6XfT/XGlU+U="; + cargoSha256 = "sha256-CQofC9Y0y8XASLpjk9B6mMlSQqiXnoGZ8kJh16txiPA="; nativeBuildInputs = [ installShellFiles ]; # In case anything goes wrong. From be99d5c1d5fe7959491383595697c78f5dd96727 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 May 2022 12:59:39 +0200 Subject: [PATCH 088/108] upterm: 0.7.3 -> 0.8.2 Update upterm to version 0.8.2 and also use Go version 1.18 since this is the minimum required version. Signed-off-by: Felix Singer --- pkgs/tools/misc/upterm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/upterm/default.nix b/pkgs/tools/misc/upterm/default.nix index 29775881378..c392dd28027 100644 --- a/pkgs/tools/misc/upterm/default.nix +++ b/pkgs/tools/misc/upterm/default.nix @@ -1,18 +1,18 @@ { lib -, buildGoModule +, buildGo118Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo118Module rec { pname = "upterm"; - version = "0.7.3"; + version = "0.8.2"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-eEzFqKYhsG5e1DVLWJq08NM9xyfn1yPNV0NIgOErj4E="; + hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs="; }; vendorSha256 = null; From 7b4cc7647f6b78cb990a5478b1e536ff7207b889 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 12:58:03 +0000 Subject: [PATCH 089/108] python310Packages.dunamai: 1.11.1 -> 1.12.0 --- pkgs/development/python-modules/dunamai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 8b51d829c8d..7627c0505ac 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dunamai"; - version = "1.11.1"; + version = "1.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mtkennerly"; repo = "dunamai"; - rev = "v${version}"; - sha256 = "sha256-nkE9QBziCQA/aN+Z0OuqJlf5FJ4fidE7u5Gt25zjX0c="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-SyHml8TIcqU7KQE4IuTZbp+Jktao7ReJHQyHV8wKeWg="; }; nativeBuildInputs = [ From 53a2f8129cea6e67a163283d38abf8fcb7cf8520 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 15:45:38 +0200 Subject: [PATCH 090/108] python310Packages.holoviews: disable on older Python releases --- .../python-modules/holoviews/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index e1ad9ee1123..57797ff8acd 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -1,26 +1,30 @@ -{ buildPythonPackage +{ lib +, bokeh +, buildPythonPackage +, colorcet , fetchPypi -, lib -, param -, numpy -, pyviz-comms , ipython +, matplotlib , notebook +, numpy , pandas -, matplotlib -, bokeh -, scipy , panel -, colorcet +, param +, pythonOlder +, pyviz-comms +, scipy }: buildPythonPackage rec { pname = "holoviews"; version = "1.14.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo="; + hash = "sha256-mRI5CqJ58/vb5N81UYsS6Hy+zNeRXnIZEd7lVW22MGo="; }; propagatedBuildInputs = [ @@ -35,12 +39,14 @@ buildPythonPackage rec { # tests not fully included with pypi release doCheck = false; - pythonImportsCheck = [ "holoviews" ]; + pythonImportsCheck = [ + "holoviews" + ]; meta = with lib; { description = "Python data analysis and visualization seamless and simple"; homepage = "http://www.holoviews.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From f174d308de4fe8a3854bbb4ca4f8aca5384c119b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 15:49:07 +0200 Subject: [PATCH 091/108] python310Packages.nutils: add format --- .../python-modules/nutils/default.nix | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 9e42027ac2e..84003ce30be 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,8 +1,18 @@ -{ lib, buildPythonPackage, fetchFromGitHub, numpy, treelog, stringly, pytestCheckHook, pythonOlder }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, treelog +, stringly +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "nutils"; version = "7.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -12,26 +22,29 @@ buildPythonPackage rec { hash = "sha256-V7lSMhwzc9+36uXMCy5uF241XwJ62Pdf59RUulOt4i8="; }; - pythonImportsCheck = [ "nutils" ]; - propagatedBuildInputs = [ numpy treelog stringly ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nutils" + ]; disabledTestPaths = [ # AttributeError: type object 'setup' has no attribute '__code__' "tests/test_cli.py" ]; - meta = with lib; { description = "Numerical Utilities for Finite Element Analysis"; homepage = "https://www.nutils.org/"; license = licenses.mit; - maintainers = [ maintainers.Scriptkiddi ]; + maintainers = with maintainers; [ Scriptkiddi ]; }; } From 8281169ad828c9ccd2b0b1917029377316601f00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 16:01:43 +0200 Subject: [PATCH 092/108] python310Packages.azure-mgmt-recoveryservicesbackup: diable on older Python releases --- .../azure-mgmt-recoveryservicesbackup/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 564954af764..f2426586d6a 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -5,17 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; version = "4.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; + hash = "sha256-At0BP9mWJneG65FDZuQXTnikaNcEWe+GtTr9ZPri89M="; }; propagatedBuildInputs = [ @@ -23,13 +26,14 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - azure-mgmt-nspkg ]; - # has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; + pythonImportsCheck = [ + "azure.mgmt.recoveryservicesbackup" + ]; meta = with lib; { description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; From 7699ee43269822c3844370b760507c4017bac7e1 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 7 May 2022 16:27:23 +0200 Subject: [PATCH 093/108] citra: fix Cubeb under SDL interface https://github.com/NixOS/nixpkgs/issues/171173 --- pkgs/applications/emulators/citra/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 92d0f5b1d36..31f5ebc3038 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -77,9 +77,11 @@ stdenv.mkDerivation { chmod -R a+w externals/zstd ''; - # Todo: cubeb audio backend (the default one) doesn't work on the SDL interface. - # This seems to be a problem with libpulseaudio, other applications have similar problems (e.g Duckstation). - # Note that the two interfaces have two separate configuration files. + # Fixes https://github.com/NixOS/nixpkgs/issues/171173 + postInstall = lib.optionalString (enableCubeb && enableSdl2) '' + wrapProgram "$out/bin/citra" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} + ''; meta = with lib; { homepage = "https://citra-emu.org"; From a62444153e7589ab3cf9d3575aa4e889d0be8da4 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Sat, 7 May 2022 16:27:51 +0200 Subject: [PATCH 094/108] duckstation: fix Cubeb under SDL interface https://github.com/NixOS/nixpkgs/issues/171173 --- pkgs/applications/emulators/duckstation/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/duckstation/default.nix b/pkgs/applications/emulators/duckstation/default.nix index 8e4d909a724..45bb9ed74f9 100644 --- a/pkgs/applications/emulators/duckstation/default.nix +++ b/pkgs/applications/emulators/duckstation/default.nix @@ -90,8 +90,9 @@ mkDerivation rec { runHook postCheck ''; + # Libpulseaudio fixes https://github.com/NixOS/nixpkgs/issues/171173 qtWrapperArgs = [ - "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio vulkan-loader ]}" ]; meta = with lib; { @@ -102,5 +103,3 @@ mkDerivation rec { platforms = platforms.linux; }; } -# TODO: default sound backend (cubeb) does not work, but SDL does. Strangely, -# switching to cubeb while a game is running makes it work. From ed76aec1fd45060f30a9a13e47473a3bca34d7a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 17:30:25 +0200 Subject: [PATCH 095/108] python310Packages.types-toml: 0.10.6 -> 0.10.7 --- pkgs/development/python-modules/types-toml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix index ed965cbb8c4..5b1482440ea 100644 --- a/pkgs/development/python-modules/types-toml/default.nix +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-toml"; - version = "0.10.6"; + version = "0.10.7"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-aus+17+oaTgVUcd07WqRQuPu2YqD76UQipYy6v1W3NM="; + sha256 = "sha256-pWf+JhSxd9U3rZmmYa3Jv8jFWkb5XmY3Ck7S3RcTNfk="; }; # Module doesn't have tests From f2105a9fabd117e1cdc0a50d3fc2d0863f8b3ddc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 15:32:02 +0000 Subject: [PATCH 096/108] python310Packages.phonenumbers: 8.12.47 -> 8.12.48 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 4f8dc93c671..2366d94ed8c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.47"; + version = "8.12.48"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vv1gXS9UYOHfIRcIW2U7s4MiKV7GWOasqvycl2hn1SI="; + sha256 = "sha256-rwaB+/6foHITdq2bcp53Ll0gvyz1DZ3Yyi8L3Xjp8M4="; }; checkInputs = [ From eabc4578dbcd3912fee3bb37ae4d7bf1b35ea431 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 17:38:25 +0200 Subject: [PATCH 097/108] tfsec: 1.19.1 -> 1.20.0 --- pkgs/development/tools/analysis/tfsec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index a4fdf0085c3..cedf2535df3 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.19.1"; + version = "1.20.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xeAMwYpi9WvKALzOPLjVItHYzFJW+O++5jgqRSC7awk="; + sha256 = "sha256-ikMmd+avT8Fl+oZti2aegX4knYmPgEE/FOMAMZriV0g="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-xDK40Vc2tHZ7apfKznt7EEz1vR6UhqtXHgYXR2mISiI="; + vendorSha256 = "sha256-LRXnBSG+xpQ3QqF2SiC2s3luTaBxFHOF3XXxhFZV5D0="; subPackages = [ "cmd/tfsec" From dbf2b9152fab6b6f2aa35c32d65ceec4cc61b394 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 6 May 2022 15:38:43 +0200 Subject: [PATCH 098/108] nixos/tests/systemd-nspawn: add test for machinectl pull-tar This will package up the closure of pkgs.hello in a tarball, and will later on verify machinectl pull-tar properly unpacked it, serving as a regression test for #108158. Closes #108158 --- nixos/tests/systemd-nspawn.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/tests/systemd-nspawn.nix b/nixos/tests/systemd-nspawn.nix index 5bf55060d2e..c2cb92d1130 100644 --- a/nixos/tests/systemd-nspawn.nix +++ b/nixos/tests/systemd-nspawn.nix @@ -25,8 +25,15 @@ let nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' mkdir -p $out cd $out + + # produce a testimage.raw dd if=/dev/urandom of=$out/testimage.raw bs=$((1024*1024+7)) count=5 - sha256sum testimage.raw > SHA256SUMS + + # produce a testimage2.tar.xz, containing the hello store path + tar cvJpf testimage2.tar.xz ${pkgs.hello} + + # produce signature(s) + sha256sum testimage* > SHA256SUMS export GNUPGHOME="$(mktemp -d)" cp -R ${gpgKeyring}/* $GNUPGHOME gpg --batch --sign --detach-sign --output SHA256SUMS.gpg SHA256SUMS @@ -56,5 +63,9 @@ in { client.succeed( "cmp /var/lib/machines/testimage.raw ${nspawnImages}/testimage.raw" ) + client.succeed("machinectl pull-tar --verify=signature http://server/testimage2.tar.xz") + client.succeed( + "cmp /var/lib/machines/testimage2/${pkgs.hello}/bin/hello ${pkgs.hello}/bin/hello" + ) ''; }) From 5b55f851ac310bfc993c0c3582fa071beb1f81c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 May 2022 16:16:09 +0000 Subject: [PATCH 099/108] snakemake: 7.6.1 -> 7.6.2 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 47d46dcd128..66acf07f8e4 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.6.1"; + version = "7.6.2"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-McknAQDzpTE1WdIBr8HsFpGzXuJT2kDNvLzK2gn75GM="; + hash = "sha256-mIl5c+HR2kqgJzbLVTQjJlf4Ca/+Icqg9G49yIUyipc="; }; propagatedBuildInputs = with python3.pkgs; [ From 7c32eb3fe57a78fc739e2840056bec28cf8ea132 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 12:51:31 -0300 Subject: [PATCH 100/108] all-packages.nix: reorder desktops/ Yet another cosmetical edit. --- pkgs/top-level/all-packages.nix | 91 +++++++++++++++++---------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d81096ac18..87782f38ea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6418,8 +6418,6 @@ with pkgs; gnirehtet = callPackage ../tools/networking/gnirehtet { }; - gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; - gnome-builder = callPackage ../applications/editors/gnome-builder { }; gnome-desktop = callPackage ../development/libraries/gnome-desktop { }; @@ -9145,8 +9143,6 @@ with pkgs; pamtester = callPackage ../tools/security/pamtester { }; - pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; - paperless-ngx = callPackage ../applications/office/paperless-ngx { }; paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; @@ -11704,8 +11700,6 @@ with pkgs; chase = callPackage ../tools/system/chase { }; - wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; - wimlib = callPackage ../tools/archivers/wimlib { }; wipe = callPackage ../tools/security/wipe { }; @@ -14213,25 +14207,6 @@ with pkgs; nodejs = nodejs_latest; }; - lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; - - lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; - - lxpanel = callPackage ../desktops/lxde/core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxtask = callPackage ../desktops/lxde/core/lxtask { }; - - lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; - - lxsession = callPackage ../desktops/lxde/core/lxsession { }; - kona = callPackage ../development/interpreters/kona {}; lolcode = callPackage ../development/interpreters/lolcode { }; @@ -15545,8 +15520,6 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); - gob2 = callPackage ../development/tools/misc/gob2 { }; gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; @@ -29738,8 +29711,6 @@ with pkgs; surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; }; - surf-display = callPackage ../desktops/surf-display { }; - surge = callPackage ../applications/audio/surge { inherit (gnome) zenity; git = gitMinimal; @@ -32473,12 +32444,21 @@ with pkgs; wyvern = callPackage ../games/wyvern { }; + hsetroot = callPackage ../tools/X11/hsetroot { }; + + imwheel = callPackage ../tools/X11/imwheel { }; + + kakasi = callPackage ../tools/text/kakasi { }; + ### DESKTOP ENVIRONMENTS + arcan = recurseIntoAttrs (callPackage ../desktops/arcan { + callPackage = newScope arcan; + }); + cdesktopenv = callPackage ../desktops/cdesktopenv { }; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - inherit (cinnamon) mint-x-icons mint-y-icons; enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { @@ -32503,14 +32483,35 @@ with pkgs; gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; - hsetroot = callPackage ../tools/X11/hsetroot { }; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell { }; - imwheel = callPackage ../tools/X11/imwheel { }; + gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { }; - kakasi = callPackage ../tools/text/kakasi { }; + gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { }); lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); + ### DESKTOPS/LXDE + + lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; + + lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { + gtk2 = gtk2-x11; + withGtk3 = false; + }; + + lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; + + lxpanel = callPackage ../desktops/lxde/core/lxpanel { + gtk2 = gtk2-x11; + }; + + lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; + + lxsession = callPackage ../desktops/lxde/core/lxsession { }; + + lxtask = callPackage ../desktops/lxde/core/lxtask { }; + lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs; inherit (lib) makeScope; @@ -32521,6 +32522,18 @@ with pkgs; pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { }); + pantheon-tweaks = callPackage ../desktops/pantheon/third-party/pantheon-tweaks { }; + + wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { }; + + rox-filer = callPackage ../desktops/rox/rox-filer { + gtk = gtk2; + }; + + surf-display = callPackage ../desktops/surf-display { }; + + xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); + plasma-applet-volumewin7mixer = libsForQt5.callPackage ../applications/misc/plasma-applet-volumewin7mixer { }; plasma-theme-switcher = libsForQt5.callPackage ../applications/misc/plasma-theme-switcher {}; @@ -32539,16 +32552,6 @@ with pkgs; gnome-themes-extra = gnome.gnome-themes-extra; - rox-filer = callPackage ../desktops/rox/rox-filer { - gtk = gtk2; - }; - - arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope arcan; - }); - - xfce = recurseIntoAttrs (callPackage ../desktops/xfce { }); - xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { }; ### SCIENCE/CHEMISTY @@ -35097,8 +35100,6 @@ with pkgs; chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; - chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; NSPlist = callPackage ../development/libraries/NSPlist {}; From b61c2dc01d9fbe3b24bdbb73d8535028bdac0441 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 19:01:54 +0200 Subject: [PATCH 101/108] python310Packages.pydeps: 1.10.17 -> 1.10.18 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 9cfd0fe3c9c..cc2b726a64a 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.10.17"; + version = "1.10.18"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "v${version}"; - hash = "sha256-V0LgHFvGvJqDHmyXJNb0sJjRuqGGDZpV467XDmdFg5k="; + hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY="; }; buildInputs = [ From 9642a2fe7233027d617205dbbdb99cd46013e3d5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 15:00:16 -0300 Subject: [PATCH 102/108] arcan.durden: 0.6.1+date=2022-03-11 -> 0.6.1+date=2022-04-16 --- pkgs/desktops/arcan/durden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index 46012d69d2d..5447105d358 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "durden"; - version = "0.6.1+date=2022-03-11"; + version = "0.6.1+date=2022-04-16"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "fec2a1051500df28becce188d932645743091efa"; - hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA="; + rev = "b07ba6535addf0d36a64385745cd9595f7d214b1"; + hash = "sha256-nDSuJrJvJOVpRax+AwuNAZ3Ioqfoo10EGCab1EiPbIY="; }; dontConfigure = true; From 9331ecf18eaae1a1cbb5cc5d3c32a90960f4d20d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 15:00:55 -0300 Subject: [PATCH 103/108] arcan.pipeworld: 0.pre+date=2021-12-03 -> 0.6.1+date=2022-04-03 --- pkgs/desktops/arcan/pipeworld/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 09f809aa471..86ab4259640 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pipeworld"; - version = "0.pre+date=2021-12-03"; + version = "0.pre+date=2022-04-03"; src = fetchFromGitHub { owner = "letoram"; repo = pname; - rev = "c653414670cafb0c73a57492aa3d9510460b16a9"; - hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk="; + rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; + hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; }; dontConfigure = true; From e9ebd66bf63a1a07b7449432db3938ce87becc66 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 15:12:12 -0300 Subject: [PATCH 104/108] arcan: refactor To be more similar to other expressions (especially XFCE). --- pkgs/desktops/arcan/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/arcan/default.nix b/pkgs/desktops/arcan/default.nix index 9d9f28a7953..3db4d4eb819 100644 --- a/pkgs/desktops/arcan/default.nix +++ b/pkgs/desktops/arcan/default.nix @@ -1,6 +1,6 @@ -{ callPackage, lib, pkgs }: +{ config, lib, pkgs }: -rec { +lib.makeScope pkgs.newScope (self: with self; { # Dependencies espeak = pkgs.espeak-ng; @@ -40,4 +40,4 @@ rec { name = "all-wrapped"; appls = [ durden pipeworld ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87782f38ea5..0458cfd945e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32452,9 +32452,7 @@ with pkgs; ### DESKTOP ENVIRONMENTS - arcan = recurseIntoAttrs (callPackage ../desktops/arcan { - callPackage = newScope arcan; - }); + arcan = recurseIntoAttrs (callPackage ../desktops/arcan { }); cdesktopenv = callPackage ../desktops/cdesktopenv { }; From 0ff07effdc7b38cbbc744be70217104e0b255a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:32:16 +0200 Subject: [PATCH 105/108] python310Packages.karton-autoit-ripper: update stale substituteInPlace --- .../karton-autoit-ripper/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index 2e7d561cf6e..ea79a5f453f 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -4,12 +4,16 @@ , fetchFromGitHub , karton-core , malduck +, pythonOlder , regex }: buildPythonPackage rec { pname = "karton-autoit-ripper"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; @@ -27,14 +31,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "autoit-ripper==1.0.0" "autoit-ripper" \ - --replace "malduck==3.1.0" "malduck>=3.1.0" \ - --replace "regex==2020.2.20" "regex>=2020.2.20" + --replace "autoit-ripper==" "autoit-ripper>=" \ + --replace "malduck==" "malduck>=" \ + --replace "regex==" "regex>=" ''; - # Project has no tests + # Module has no tests doCheck = false; - pythonImportsCheck = [ "karton.autoit_ripper" ]; + + pythonImportsCheck = [ + "karton.autoit_ripper" + ]; meta = with lib; { description = "AutoIt script ripper for Karton framework"; From 5ba317f26a36273dc576f3e358b4ad772d5b1a5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:36:44 +0200 Subject: [PATCH 106/108] python310Packages.malduck: add format --- pkgs/development/python-modules/malduck/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/malduck/default.nix b/pkgs/development/python-modules/malduck/default.nix index 99472d4e874..7d5998da2e9 100644 --- a/pkgs/development/python-modules/malduck/default.nix +++ b/pkgs/development/python-modules/malduck/default.nix @@ -15,13 +15,15 @@ buildPythonPackage rec { pname = "malduck"; version = "4.2.0"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM="; + hash = "sha256-UgpblcZ/Jxl3U4256YIHzly7igNXwhTdFN4HOqZBVbM="; }; propagatedBuildInputs = [ @@ -43,7 +45,9 @@ buildPythonPackage rec { # Project has no tests. They will come with the next release doCheck = false; - pythonImportsCheck = [ "malduck" ]; + pythonImportsCheck = [ + "malduck" + ]; meta = with lib; { description = "Helper for malware analysis"; From a8060ad83a839fc124128ba78ffda63e9d04d4ce Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 7 May 2022 20:51:21 +0200 Subject: [PATCH 107/108] elmPackages.{elm-test,elm-create-app...}: update nodejs dependecies --- .../compilers/elm/packages/node-packages.nix | 757 ++++++++++-------- 1 file changed, 404 insertions(+), 353 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 37e91efa59c..97d3c78220a 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -31,13 +31,13 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.17.7" = { + "@babel/compat-data-7.17.10" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz"; - sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; + sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; }; }; "@babel/core-7.12.10" = { @@ -49,13 +49,13 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.17.7" = { + "@babel/generator-7.17.10" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; - sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.10.tgz"; + sha512 = "46MJZZo9y3o4kmhBVc7zW7i8dtR1oIK/sdO5NcfcZRhTGYi+KKJRtHNgsU6c4VUcJmUNV/LQdebD/9Dlv4K+Tg=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -76,22 +76,22 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.17.7" = { + "@babel/helper-compilation-targets-7.17.10" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.17.7"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; - sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; + sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.6" = { + "@babel/helper-create-class-features-plugin-7.17.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.6"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; - sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; + sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -121,22 +121,13 @@ let sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; - "@babel/helper-function-name-7.16.7" = { + "@babel/helper-function-name-7.17.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; - }; - }; - "@babel/helper-get-function-arity-7.16.7" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; + sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; }; }; "@babel/helper-hoist-variables-7.16.7" = { @@ -265,31 +256,31 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.17.8" = { + "@babel/helpers-7.17.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz"; - sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; + sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; }; }; - "@babel/highlight-7.16.10" = { + "@babel/highlight-7.17.9" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.10"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; + sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; }; }; - "@babel/parser-7.17.8" = { + "@babel/parser-7.17.10" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.8"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; - sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz"; + sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; }; }; "@babel/plugin-proposal-async-generator-functions-7.16.8" = { @@ -652,13 +643,13 @@ let sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.17.7" = { + "@babel/plugin-transform-modules-commonjs-7.17.9" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.17.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz"; - sha512 = "ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz"; + sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw=="; }; }; "@babel/plugin-transform-modules-systemjs-7.17.8" = { @@ -679,13 +670,13 @@ let sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.17.10" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.8"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; - sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.10.tgz"; + sha512 = "v54O6yLaJySCs6mGzaVOUw9T967GnH38T6CQSAtnzdNPwu84l2qAjssKzo/WSO8Yi7NF+7ekm5cVbF/5qiIgNA=="; }; }; "@babel/plugin-transform-new-target-7.16.7" = { @@ -724,13 +715,13 @@ let sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.7" = { + "@babel/plugin-transform-regenerator-7.17.9" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; - sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz"; + sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ=="; }; }; "@babel/plugin-transform-reserved-words-7.16.7" = { @@ -850,22 +841,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.17.3" = { + "@babel/traverse-7.17.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.3"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.10.tgz"; + sha512 = "VmbrTHQteIdUUQNTb+zE12SHS/xQVIShmBPhlNP12hD5poF2pbITW1Z4172d03HegaQWhLffdkRJYtAzp0AGcw=="; }; }; - "@babel/types-7.17.0" = { + "@babel/types-7.17.10" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.0"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz"; + sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; }; }; "@hapi/address-2.1.4" = { @@ -913,6 +904,33 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; + "@jridgewell/gen-mapping-0.1.1" = { + name = "_at_jridgewell_slash_gen-mapping"; + packageName = "@jridgewell/gen-mapping"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + }; + "@jridgewell/set-array-1.1.1" = { + name = "_at_jridgewell_slash_set-array"; + packageName = "@jridgewell/set-array"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.13" = { + name = "_at_jridgewell_slash_sourcemap-codec"; + packageName = "@jridgewell/sourcemap-codec"; + version = "1.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + }; + }; "@kwsites/file-exists-1.1.1" = { name = "_at_kwsites_slash_file-exists"; packageName = "@kwsites/file-exists"; @@ -1048,22 +1066,31 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-proxy-1.17.8" = { + "@types/http-proxy-1.17.9" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; - version = "1.17.8"; + version = "1.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.8.tgz"; - sha512 = "5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA=="; + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"; + sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; }; }; - "@types/jest-27.4.1" = { + "@types/jest-27.5.0" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "27.4.1"; + version = "27.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.1.tgz"; - sha512 = "23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-27.5.0.tgz"; + sha512 = "9RBFx7r4k+msyj/arpfaa0WOOEcaAZNmN+j80KFbFCoSqCJGHTz7YMAMGQW9Xmqm5w6l5c25vbSjMwlikJi5+g=="; + }; + }; + "@types/json-buffer-3.0.0" = { + name = "_at_types_slash_json-buffer"; + packageName = "@types/json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz"; + sha512 = "3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="; }; }; "@types/json-schema-7.0.11" = { @@ -1093,13 +1120,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-17.0.23" = { + "@types/node-17.0.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.23"; + version = "17.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; - sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.31.tgz"; + sha512 = "AR0x5HbXGqkEx9CadRH3EBYx/VkiUgZIhP4wvPn/+5KIsgpNoyFaRlVe0Zlx9gRtg8fA06a9tskE2MSN7TcG4Q=="; }; }; "@types/parse-json-4.0.0" = { @@ -1147,13 +1174,13 @@ let sha512 = "ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ=="; }; }; - "@types/uglify-js-3.13.1" = { + "@types/uglify-js-3.13.2" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.1"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.1.tgz"; - sha512 = "O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.2.tgz"; + sha512 = "/xFrPIo+4zOeNGtVMbf9rUm0N+i4pDf1ynExomqtokIJmVzR3962lJ1UE+MmexMkA0cmN9oTzg5Xcbwge0Ij2Q=="; }; }; "@types/webpack-4.41.32" = { @@ -1777,13 +1804,13 @@ let sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; }; }; - "async-2.6.3" = { + "async-2.6.4" = { name = "async"; packageName = "async"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-2.6.3.tgz"; - sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; + url = "https://registry.npmjs.org/async/-/async-2.6.4.tgz"; + sha512 = "mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA=="; }; }; "async-each-1.0.3" = { @@ -2101,13 +2128,13 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.19.2" = { + "body-parser-1.20.0" = { name = "body-parser"; packageName = "body-parser"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw=="; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"; + sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg=="; }; }; "bonjour-3.5.0" = { @@ -2227,13 +2254,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.20.2" = { + "browserslist-4.20.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.2"; + version = "4.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; - sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; + sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; }; }; "buffer-4.9.2" = { @@ -2479,13 +2506,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001324" = { + "caniuse-lite-1.0.30001338" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001324"; + version = "1.0.30001338"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001324.tgz"; - sha512 = "/eYp1J6zYh1alySQB4uzYFkLmxxI8tk0kxldbNHXp8+v+rdMKdUBNjRLz7T7fz6Iox+1lIdYpc7rq6ZcXfTukg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; + sha512 = "1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -2839,13 +2866,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.9.0" = { + "color-string-1.9.1" = { name = "color-string"; packageName = "color-string"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; - sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"; + sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; }; }; "colorette-1.4.0" = { @@ -2983,6 +3010,15 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; + "compress-brotli-1.3.8" = { + name = "compress-brotli"; + packageName = "compress-brotli"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz"; + sha512 = "lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -3109,13 +3145,13 @@ let sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; }; }; - "cookie-0.4.2" = { + "cookie-0.5.0" = { name = "cookie"; packageName = "cookie"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"; - sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA=="; + url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"; + sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw=="; }; }; "cookie-signature-1.0.6" = { @@ -3163,13 +3199,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.21.1" = { + "core-js-compat-3.22.4" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.21.1"; + version = "3.22.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; - sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.4.tgz"; + sha512 = "dIWcsszDezkFZrfm1cnB4f/J85gyhiCpxbgBdohWCDtSVuAaChTSpPV7ldOQf/Xds2U5xCIJZOK82G4ZPAIswA=="; }; }; "core-util-is-1.0.2" = { @@ -3622,13 +3658,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "define-property-0.2.5" = { @@ -3829,13 +3865,13 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; - "dom-serializer-1.3.2" = { + "dom-serializer-1.4.1" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "1.3.2"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; - sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"; + sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; }; }; "domain-browser-1.2.0" = { @@ -3856,13 +3892,13 @@ let sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; }; }; - "domelementtype-2.2.0" = { + "domelementtype-2.3.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; - sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"; + sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; }; }; "domhandler-4.3.1" = { @@ -3964,13 +4000,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.103" = { + "electron-to-chromium-1.4.137" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.103"; + version = "1.4.137"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz"; - sha512 = "c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz"; + sha512 = "0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA=="; }; }; "elliptic-6.5.4" = { @@ -4054,13 +4090,13 @@ let sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; }; }; - "elm-tooling-1.7.0" = { + "elm-tooling-1.8.0" = { name = "elm-tooling"; packageName = "elm-tooling"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.7.0.tgz"; - sha512 = "EHZ54voWrG3BhUONbH/wFw5U95H6N7R4QFgXHDrPIaDBDdeyNkpFu4QWArSWkhzxyCF7hqT8ya2yy7SferDsgg=="; + url = "https://registry.npmjs.org/elm-tooling/-/elm-tooling-1.8.0.tgz"; + sha512 = "IjMvW/VHqxLidlJSAocBGDBmqiZ1NS0lK/UCMRU4ULEEaTVjpSd/9Dv0mH2ok0H0egSTYx19GnrdL4Lq9h+z+A=="; }; }; "elm-webpack-loader-6.0.1" = { @@ -4171,13 +4207,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.19.2" = { + "es-abstract-1.20.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz"; - sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.0.tgz"; + sha512 = "URbD8tgRthKD3YcC39vbvSDrX23upXnPcnGAjQfgxXF5ID75YcENawc9ZX/9iTP9ptUyfCLIxTTuMYoRfiOVKA=="; }; }; "es-to-primitive-1.2.1" = { @@ -4405,13 +4441,13 @@ let sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; }; }; - "express-4.17.3" = { + "express-4.18.1" = { name = "express"; packageName = "express"; - version = "4.17.3"; + version = "4.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.3.tgz"; - sha512 = "yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg=="; + url = "https://registry.npmjs.org/express/-/express-4.18.1.tgz"; + sha512 = "zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q=="; }; }; "express-ws-2.0.0" = { @@ -4666,6 +4702,15 @@ let sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; }; }; + "finalhandler-1.2.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; + }; + }; "find-0.2.7" = { name = "find"; packageName = "find"; @@ -4819,13 +4864,13 @@ let sha512 = "SDgHBgV+RCjrYs8aUwCb9rTgbTVuSdzvFmLaChsLre1yf+D64khCW++VYciaByZ8Rm0uKF8R/XEpXuTRSGUM1A=="; }; }; - "follow-redirects-1.14.9" = { + "follow-redirects-1.15.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.9"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.9.tgz"; - sha512 = "MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; }; "for-in-1.0.2" = { @@ -5044,6 +5089,24 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; + "function.prototype.name-1.1.5" = { + name = "function.prototype.name"; + packageName = "function.prototype.name"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; + sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + }; + }; + "functions-have-names-1.2.3" = { + name = "functions-have-names"; + packageName = "functions-have-names"; + version = "1.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"; + sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; + }; + }; "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; @@ -5287,13 +5350,13 @@ let sha512 = "R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q=="; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "gzip-size-5.0.0" = { @@ -5350,13 +5413,13 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-bigints-1.0.1" = { + "has-bigints-1.0.2" = { name = "has-bigints"; packageName = "has-bigints"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; + url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"; + sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; }; }; "has-flag-3.0.0" = { @@ -5377,6 +5440,15 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; + }; + }; "has-symbol-support-x-1.4.2" = { name = "has-symbol-support-x"; packageName = "has-symbol-support-x"; @@ -5629,15 +5701,6 @@ let sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; }; }; - "http-errors-1.8.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; - }; - }; "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; @@ -6088,13 +6151,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.8.1" = { + "is-core-module-2.9.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-data-descriptor-0.1.4" = { @@ -6790,13 +6853,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.1.1" = { + "keyv-4.2.2" = { name = "keyv"; packageName = "keyv"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz"; - sha512 = "tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.2.2.tgz"; + sha512 = "uYS0vKTlBIjNCAUqrjlxmruxOEiZxZIHXyp32sdcGmP+ukFrmWUnE//RcPXJH3Vxrni1H2gsQbjHE0bH7MtMQQ=="; }; }; "killable-1.0.1" = { @@ -7555,13 +7618,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "moment-2.29.1" = { + "moment-2.29.3" = { name = "moment"; packageName = "moment"; - version = "2.29.1"; + version = "2.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; + sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; }; }; "move-concurrently-1.0.1" = { @@ -7672,13 +7735,13 @@ let sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; }; }; - "nanoid-3.3.2" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.2"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz"; - sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "nanomatch-1.2.13" = { @@ -7780,13 +7843,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.2" = { + "node-releases-2.0.4" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz"; + sha512 = "gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ=="; }; }; "node-watch-0.5.5" = { @@ -8770,13 +8833,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.12" = { + "postcss-8.4.13" = { name = "postcss"; packageName = "postcss"; - version = "8.4.12"; + version = "8.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; - sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; + sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; }; }; "postcss-calc-7.0.5" = { @@ -9346,6 +9409,15 @@ let sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; }; }; + "qs-6.10.3" = { + name = "qs"; + packageName = "qs"; + version = "6.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"; + sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; + }; + }; "qs-6.5.1" = { name = "qs"; packageName = "qs"; @@ -9373,15 +9445,6 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.7" = { - name = "qs"; - packageName = "qs"; - version = "6.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz"; - sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw=="; - }; - }; "query-string-4.3.4" = { name = "query-string"; packageName = "query-string"; @@ -9472,13 +9535,13 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.4.3" = { + "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.3"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.3.tgz"; - sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; "rc-1.2.8" = { @@ -9670,13 +9733,13 @@ let sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; }; }; - "regenerator-transform-0.14.5" = { + "regenerator-transform-0.15.0" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.5"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; + sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; }; }; "regex-not-1.0.2" = { @@ -9688,13 +9751,13 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexp.prototype.flags-1.4.1" = { + "regexp.prototype.flags-1.4.3" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.4.1"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz"; - sha512 = "pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; + sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; "regexpu-core-5.0.1" = { @@ -10228,13 +10291,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "semver-regex-3.1.3" = { @@ -10273,15 +10336,6 @@ let sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; }; }; - "send-0.17.2" = { - name = "send"; - packageName = "send"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; - }; - }; "send-0.18.0" = { name = "send"; packageName = "send"; @@ -10336,15 +10390,6 @@ let sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; }; }; - "serve-static-1.14.2" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; - }; - }; "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; @@ -10489,13 +10534,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.5.0" = { + "simple-git-3.7.1" = { name = "simple-git"; packageName = "simple-git"; - version = "3.5.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz"; - sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz"; + sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A=="; }; }; "simple-swizzle-0.2.2" = { @@ -10948,22 +10993,22 @@ let sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string.prototype.trimend-1.0.4" = { + "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; }; }; - "string.prototype.trimstart-1.0.4" = { + "string.prototype.trimstart-1.0.5" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; }; }; "string_decoder-0.10.31" = { @@ -11524,13 +11569,13 @@ let sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; }; }; - "tslib-2.3.1" = { + "tslib-2.4.0" = { name = "tslib"; packageName = "tslib"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"; - sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; }; "tsyringe-4.6.0" = { @@ -11605,13 +11650,13 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "typescript-4.6.3" = { + "typescript-4.6.4" = { name = "typescript"; packageName = "typescript"; - version = "4.6.3"; + version = "4.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"; - sha512 = "yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; + sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; }; }; "uglify-es-3.3.10" = { @@ -11650,13 +11695,13 @@ let sha512 = "UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og=="; }; }; - "unbox-primitive-1.0.1" = { + "unbox-primitive-1.0.2" = { name = "unbox-primitive"; packageName = "unbox-primitive"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; + url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; + sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -12732,7 +12777,7 @@ in sources."fresh-0.5.2" sources."fs-extra-2.0.0" sources."getpass-0.1.7" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."http-errors-1.7.2" @@ -12940,7 +12985,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -12977,7 +13022,7 @@ in sources."minipass-3.1.6" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."moment-2.29.1" + sources."moment-2.29.3" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -13109,7 +13154,7 @@ in sources."balanced-match-1.0.2" sources."batch-0.6.1" sources."binary-extensions-2.2.0" - sources."body-parser-1.19.2" + sources."body-parser-1.20.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."bytes-3.1.2" @@ -13119,6 +13164,7 @@ in sources."lowercase-keys-2.0.0" ]; }) + sources."call-bind-1.0.2" sources."chalk-3.0.0" sources."chokidar-3.5.3" sources."clone-response-1.0.2" @@ -13128,44 +13174,44 @@ in sources."concat-map-0.0.1" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."escape-html-1.0.3" sources."etag-1.8.1" - (sources."express-4.17.3" // { - dependencies = [ - sources."serve-static-1.14.2" - ]; - }) + sources."express-4.18.1" (sources."express-ws-4.0.0" // { dependencies = [ sources."ws-5.2.3" ]; }) sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" sources."get-stream-4.1.0" sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."got-9.6.0" + sources."has-1.0.3" sources."has-flag-4.0.0" + sources."has-symbols-1.0.3" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -13195,7 +13241,8 @@ in sources."negotiator-0.6.3" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" - sources."on-finished-2.3.0" + sources."object-inspect-1.12.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."open-7.4.2" sources."p-cancelable-1.1.0" @@ -13208,9 +13255,9 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.7" sources."pump-3.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."range-parser-1.2.1" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" sources."readdirp-3.6.0" sources."registry-auth-token-4.2.1" @@ -13220,33 +13267,26 @@ in sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" ]; }) (sources."serve-index-1.9.1" // { dependencies = [ + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - (sources."serve-static-1.15.0" // { - dependencies = [ - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."http-errors-2.0.0" - sources."ms-2.1.3" - sources."on-finished-2.4.1" - sources."send-0.18.0" - sources."statuses-2.0.1" - ]; - }) + sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."statuses-1.5.0" + sources."side-channel-1.0.4" + sources."statuses-2.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tmp-0.1.0" @@ -13395,7 +13435,7 @@ in }) sources."fill-range-7.0.1" sources."finalhandler-1.1.2" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."fresh-0.5.2" sources."fsevents-2.3.2" sources."get-stream-4.1.0" @@ -13492,13 +13532,13 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."glob-7.2.0" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -13548,8 +13588,9 @@ in sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13559,6 +13600,7 @@ in sources."mimic-response-1.0.1" ]; }) + sources."compress-brotli-1.3.8" sources."config-chain-1.1.13" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" @@ -13568,7 +13610,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-5.2.0" sources."got-10.7.0" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."http-cache-semantics-4.1.0" @@ -13578,7 +13620,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.1.1" + sources."keyv-4.2.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -13595,7 +13637,7 @@ in sources."responselike-2.0.0" sources."safe-buffer-5.2.1" sources."safename-1.0.2" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."to-readable-stream-2.1.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.10.0" @@ -13697,7 +13739,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.4" sources."glob-parent-5.1.2" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-flag-3.0.0" @@ -13823,7 +13865,7 @@ in sources."compare-versions-3.6.0" sources."core-util-is-1.0.3" sources."fs-extra-6.0.1" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."inherits-2.0.4" sources."isarray-1.0.0" sources."jsonfile-4.0.0" @@ -13866,22 +13908,21 @@ in dependencies = [ sources."@babel/cli-7.12.10" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.7" + sources."@babel/compat-data-7.17.10" sources."@babel/core-7.12.10" - sources."@babel/generator-7.17.7" + sources."@babel/generator-7.17.10" sources."@babel/helper-annotate-as-pure-7.16.7" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.17.7" // { + (sources."@babel/helper-compilation-targets-7.17.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-class-features-plugin-7.17.9" sources."@babel/helper-create-regexp-features-plugin-7.17.0" sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.16.7" - sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" @@ -13896,9 +13937,9 @@ in sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.17.8" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.8" + sources."@babel/helpers-7.17.9" + sources."@babel/highlight-7.17.9" + sources."@babel/parser-7.17.10" sources."@babel/plugin-proposal-async-generator-functions-7.16.8" sources."@babel/plugin-proposal-class-properties-7.16.7" sources."@babel/plugin-proposal-dynamic-import-7.16.7" @@ -13939,15 +13980,15 @@ in sources."@babel/plugin-transform-literals-7.16.7" sources."@babel/plugin-transform-member-expression-literals-7.16.7" sources."@babel/plugin-transform-modules-amd-7.16.7" - sources."@babel/plugin-transform-modules-commonjs-7.17.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.9" sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.10" sources."@babel/plugin-transform-new-target-7.16.7" sources."@babel/plugin-transform-object-super-7.16.7" sources."@babel/plugin-transform-parameters-7.16.7" sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-regenerator-7.17.9" sources."@babel/plugin-transform-reserved-words-7.16.7" sources."@babel/plugin-transform-runtime-7.12.10" sources."@babel/plugin-transform-shorthand-properties-7.16.7" @@ -13961,26 +14002,29 @@ in sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.17.3" - sources."@babel/types-7.17.0" + sources."@babel/traverse-7.17.10" + sources."@babel/types-7.17.10" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" + sources."@jridgewell/gen-mapping-0.1.1" + sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/sourcemap-codec-1.4.13" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" sources."@types/html-minifier-terser-5.1.2" - sources."@types/http-proxy-1.17.8" + sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.13.1" // { + (sources."@types/uglify-js-3.13.2" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14098,12 +14142,12 @@ in sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."bn.js-5.2.0" - (sources."body-parser-1.19.2" // { + (sources."body-parser-1.20.0" // { dependencies = [ sources."bytes-3.1.2" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" ]; }) (sources."bonjour-3.5.0" // { @@ -14126,7 +14170,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.2" + sources."browserslist-4.20.3" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -14143,7 +14187,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001324" + sources."caniuse-lite-1.0.30001338" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14199,7 +14243,7 @@ in sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.9.0" + sources."color-string-1.9.1" sources."colorette-1.4.0" sources."colors-1.4.0" sources."combined-stream-1.0.8" @@ -14226,7 +14270,7 @@ in }) sources."content-type-1.0.4" sources."convert-source-map-1.8.0" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" @@ -14242,7 +14286,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.21.1" // { + (sources."core-js-compat-3.22.4" // { dependencies = [ sources."semver-7.0.0" ]; @@ -14265,7 +14309,7 @@ in sources."camelcase-6.3.0" sources."loader-utils-2.0.2" sources."lru-cache-6.0.0" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."yallist-4.0.0" ]; }) @@ -14299,7 +14343,7 @@ in sources."decode-uri-component-0.2.0" sources."deep-equal-0.2.2" sources."default-gateway-4.2.0" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."define-property-2.0.2" (sources."del-4.1.1" // { dependencies = [ @@ -14311,9 +14355,9 @@ in ]; }) sources."delayed-stream-1.0.0" - sources."depd-1.1.2" + sources."depd-2.0.0" sources."des.js-1.0.1" - sources."destroy-1.0.4" + sources."destroy-1.2.0" sources."detect-node-2.1.0" (sources."detect-port-alt-1.1.6" // { dependencies = [ @@ -14331,9 +14375,9 @@ in sources."dns-packet-1.3.4" sources."dns-txt-2.0.2" sources."dom-converter-0.2.0" - sources."dom-serializer-1.3.2" + sources."dom-serializer-1.4.1" sources."domain-browser-1.2.0" - sources."domelementtype-2.2.0" + sources."domelementtype-2.3.0" sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-case-3.0.4" @@ -14343,7 +14387,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.103" + sources."electron-to-chromium-1.4.137" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14365,7 +14409,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -14379,7 +14423,7 @@ in sources."entities-2.2.0" sources."errno-0.1.8" sources."error-ex-1.3.2" - sources."es-abstract-1.19.2" + sources."es-abstract-1.20.0" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -14428,12 +14472,12 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."express-4.17.3" // { + (sources."express-4.18.1" // { dependencies = [ sources."array-flatten-1.1.1" sources."debug-2.6.9" sources."ms-2.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."safe-buffer-5.2.1" ]; }) @@ -14491,7 +14535,7 @@ in sources."file-uri-to-path-1.0.0" sources."filesize-3.6.1" sources."fill-range-7.0.1" - (sources."finalhandler-1.1.2" // { + (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" sources."ms-2.0.0" @@ -14507,7 +14551,7 @@ in sources."find-up-4.1.0" sources."firstline-1.3.1" sources."flush-write-stream-1.1.1" - sources."follow-redirects-1.14.9" + sources."follow-redirects-1.15.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -14522,6 +14566,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.1" @@ -14550,7 +14596,7 @@ in sources."slash-1.0.0" ]; }) - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" (sources."gzip-size-5.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -14560,8 +14606,9 @@ in sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" - sources."has-bigints-1.0.1" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" @@ -14595,7 +14642,7 @@ in sources."html-webpack-plugin-4.5.0" sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http-parser-js-0.5.6" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" @@ -14649,7 +14696,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.4" sources."is-color-stop-1.1.0" - sources."is-core-module-2.8.1" + sources."is-core-module-2.9.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" @@ -14769,7 +14816,7 @@ in sources."multicast-dns-service-types-1.1.0" sources."mute-stream-0.0.8" sources."nan-2.15.0" - sources."nanoid-3.3.2" + sources."nanoid-3.3.4" sources."nanomatch-1.2.13" sources."ncp-1.0.1" sources."negotiator-0.6.3" @@ -14791,7 +14838,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.2" + sources."node-releases-2.0.4" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -14828,7 +14875,7 @@ in sources."object.pick-1.3.0" sources."object.values-1.1.5" sources."obuf-1.1.2" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" @@ -14892,7 +14939,7 @@ in sources."pkginfo-0.4.1" (sources."portfinder-1.0.28" // { dependencies = [ - sources."async-2.6.3" + sources."async-2.6.4" sources."debug-3.2.7" sources."minimist-1.2.6" sources."mkdirp-0.5.6" @@ -14931,7 +14978,7 @@ in sources."path-type-4.0.0" sources."resolve-from-4.0.0" sources."schema-utils-3.1.1" - sources."semver-7.3.5" + sources."semver-7.3.7" sources."yallist-4.0.0" ]; }) @@ -15024,7 +15071,7 @@ in }) (sources."postcss-safe-parser-5.0.2" // { dependencies = [ - sources."postcss-8.4.12" + sources."postcss-8.4.13" ]; }) sources."postcss-selector-parser-6.0.10" @@ -15068,7 +15115,7 @@ in sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" - (sources."raw-body-2.4.3" // { + (sources."raw-body-2.5.1" // { dependencies = [ sources."bytes-3.1.2" ]; @@ -15128,9 +15175,9 @@ in sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" + sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.1" + sources."regexp.prototype.flags-1.4.3" sources."regexpu-core-5.0.1" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { @@ -15180,7 +15227,7 @@ in sources."select-hose-2.0.0" sources."selfsigned-1.10.14" sources."semver-5.7.1" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ (sources."debug-2.6.9" // { dependencies = [ @@ -15194,13 +15241,15 @@ in (sources."serve-index-1.9.1" // { dependencies = [ sources."debug-2.6.9" + sources."depd-1.1.2" sources."http-errors-1.6.3" sources."inherits-2.0.3" sources."ms-2.0.0" sources."setprototypeof-1.1.0" + sources."statuses-1.5.0" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -15308,7 +15357,7 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-browserify-2.0.2" sources."stream-each-1.2.3" sources."stream-http-2.8.3" @@ -15320,8 +15369,8 @@ in sources."strip-ansi-6.0.1" ]; }) - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -15350,7 +15399,7 @@ in sources."css-what-3.4.2" (sources."dom-serializer-0.2.2" // { dependencies = [ - sources."domelementtype-2.2.0" + sources."domelementtype-2.3.0" ]; }) sources."domelementtype-1.3.1" @@ -15400,7 +15449,7 @@ in sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.3.1" + sources."tslib-2.4.0" sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -15435,7 +15484,7 @@ in sources."yallist-2.1.2" ]; }) - sources."unbox-primitive-1.0.1" + sources."unbox-primitive-1.0.2" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -15681,7 +15730,7 @@ in sha512 = "DKhH6o+SNo3m8y9qAM932/gLMK0YmNSJevHdBYkaDWfKiw+vlo4Wtfskb8CI8ZAzWrAOcDNiLCsEbSsbPHk2Vg=="; }; dependencies = [ - sources."@types/jest-27.4.1" + sources."@types/jest-27.5.0" sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" sources."balanced-match-1.0.2" @@ -15726,7 +15775,7 @@ in sources."supports-color-7.2.0" sources."temp-0.9.4" sources."ts-union-2.3.0" - sources."typescript-4.6.3" + sources."typescript-4.6.4" sources."which-1.3.1" sources."wrappy-1.0.2" ]; @@ -15743,18 +15792,19 @@ in elm-review = nodeEnv.buildNodePackage { name = "elm-review"; packageName = "elm-review"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.1.tgz"; - sha512 = "leDgjvE6ldYSOG/jMLmMw2g1vRnrd9nH9mnQcJt57SY2F4FnZT2hfIbuIUBXPaBwhWwC0a6BRt+Jv/2sGOG03A=="; + url = "https://registry.npmjs.org/elm-review/-/elm-review-2.7.2.tgz"; + sha512 = "llkRvxgR2GOmtc7wi2vAM+u9j61Pf1fmPsAbpsE4X0ZfusJv0Dddor3lHNNZ0MmpYzNxpm7npxNqYRXs5JIz9A=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.23" + sources."@types/node-17.0.31" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -15786,6 +15836,7 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."cross-spawn-7.0.3" sources."debug-4.3.4" @@ -15793,7 +15844,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."duplexer3-0.1.4" - sources."elm-tooling-1.7.0" + sources."elm-tooling-1.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."fast-levenshtein-3.0.0" @@ -15808,7 +15859,7 @@ in sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."got-10.7.0" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" sources."http-cache-semantics-4.1.0" sources."ieee754-1.2.1" @@ -15824,7 +15875,7 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.1.1" + sources."keyv-4.2.2" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -15905,8 +15956,8 @@ in sources."git-clone-able-0.1.2" sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."semver-7.3.5" - sources."simple-git-3.5.0" + sources."semver-7.3.7" + sources."simple-git-3.7.1" sources."upath-2.0.1" sources."yallist-4.0.0" ]; From a917f83e33a7187bfadc3b88a24b61801dff82fc Mon Sep 17 00:00:00 2001 From: Erik Rodriguez Date: Sat, 7 May 2022 19:12:14 -0300 Subject: [PATCH 108/108] neofetch: unstable-2020-11-26 -> unstable-2020-12-10 --- pkgs/tools/misc/neofetch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 77af8d5d788..64632986638 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -4,13 +4,13 @@ stdenvNoCC.mkDerivation rec { pname = "neofetch"; - version = "unstable-2020-11-26"; + version = "unstable-2020-12-10"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; - rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f"; - sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE="; + rev = "ccd5d9f52609bbdcd5d8fa78c4fdb0f12954125f"; + sha256 = "sha256-9MoX6ykqvd2iB0VrZCfhSyhtztMpBTukeKejfAWYW1w="; }; patches = [