From f3c2f298c4d40012ed457cfe21ece28f72c0f8e9 Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Wed, 20 Jul 2022 12:38:39 +0200 Subject: [PATCH 001/223] akonadi: Add package argument for PostgreSQL support --- pkgs/applications/kde/akonadi/default.nix | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index e656d36a1c9b..d86882c7798f 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -2,10 +2,16 @@ mkDerivation, lib, kdepimTeam, substituteAll, extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, - kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, qttools, - signond, xz, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mariadb, + postgresql, qttools, signond, xz, + + mysqlSupport ? true, + postgresSupport ? false, + defaultDriver ? if mysqlSupport then "MYSQL" else "POSTGRES", }: +assert mysqlSupport || postgresSupport; + mkDerivation { pname = "akonadi"; meta = { @@ -26,17 +32,19 @@ mkDerivation { propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; CXXFLAGS = [ - ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mariadb}/bin/mysqld\"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mariadb}/bin/mysqladmin\"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mariadb}/bin/mysql_install_db\"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mariadb}/bin/mysqlcheck\"'' - ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' - ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"\"'' - ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' + ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqld"}\"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqladmin"}\"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysql_install_db"}\"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.optionalString mysqlSupport "${lib.getBin mariadb}/bin/mysqlcheck"}\"'' + ''-DNIXPKGS_POSTGRES_PG_CTL=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_ctl"}\"'' + ''-DNIXPKGS_POSTGRES_PG_UPGRADE=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/pg_upgrade"}\"'' + ''-DNIXPKGS_POSTGRES_INITDB=\"${lib.optionalString postgresSupport "${lib.getBin postgresql}/bin/initdb"}\"'' ''-DNIX_OUT=\"${placeholder "out"}\"'' ''-I${lib.getDev kio}/include/KF5'' # Fixes: kio_version.h: No such file or directory ]; + cmakeFlags = lib.optional (defaultDriver != "MYSQL") "-DDATABASE_BACKEND=${defaultDriver}"; + # compatibility symlinks for kmymoney, can probably be removed in next kde bump postInstall = '' ln -s $dev/include/KF5/AkonadiCore/Akonadi/Collection $dev/include/KF5/AkonadiCore/Collection From 980dec4db0784f672b9e6f520e02886684e4729a Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 4 Oct 2022 09:06:40 +0200 Subject: [PATCH 002/223] plasma5Packages.kzones: 0.3 -> 0.4 Signed-off-by: Matthias Beyer --- pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index a56ebf1579b1..9d361f943a4c 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "kzones"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${version}"; - sha256 = "sha256-o7ItUHPayR0wnySssWvtVAaMRa9A1m778FY500hXHXQ="; + sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM="; }; buildInputs = [ From 37a4203e80af29d57c8fdebc87c97c073c40c888 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Wed, 19 Oct 2022 18:14:03 +0800 Subject: [PATCH 003/223] gnome-extension-manager: remove workaround This has been added some time from upstream. See mjakeman/extension-manager#263. --- pkgs/applications/misc/gnome-extension-manager/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index bcc66b19cf2b..28a4fa84caeb 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -54,9 +54,6 @@ stdenv.mkDerivation rec { text-engine ]; - # See https://github.com/NixOS/nixpkgs/issues/36468. - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - meta = with lib; { description = "Desktop app for managing GNOME shell extensions"; homepage = "https://github.com/mjakeman/extension-manager"; From f8fcc169f8473de7e5755e2cfff91f22079f03bb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 27 Oct 2022 22:01:42 +0200 Subject: [PATCH 004/223] privacyidea: 3.7.3 -> 3.7.4 ChangeLog: https://github.com/privacyidea/privacyidea/releases/tag/v3.7.4 --- pkgs/applications/misc/privacyidea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 405d992576da..8ec18a874863 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -89,13 +89,13 @@ let in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; - version = "3.7.3"; + version = "3.7.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-odwYUGfgoRrGbLpOh8SuQzYby8Ya6hKSn0rdHp+RS/U="; + sha256 = "sha256-QoVL6WJjX6+sN5S/iqV3kcfQ5fWTXkTnf6NpZcw3bGo="; fetchSubmodules = true; }; From 83f16f1c49eaf3d0362ce0851d8cc0b110183273 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Oct 2022 19:56:00 +0000 Subject: [PATCH 005/223] i3-gaps: 4.21 -> 4.21.1 --- pkgs/applications/window-managers/i3/gaps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 64d863e8047f..35a58bd25f00 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -2,13 +2,13 @@ i3.overrideAttrs (oldAttrs : rec { pname = "i3-gaps"; - version = "4.21"; + version = "4.21.1"; src = fetchFromGitHub { owner = "Airblader"; repo = "i3"; rev = version; - sha256 = "sha256-douSRvnyDbi2gDJfu9VZmmTyYfy+FrFWHgyAyPyBWdM="; + sha256 = "sha256-+JxJjvzEuAA4CH+gufzAzIqd5BSvHtPvLm2zTfXc/xk="; }; meta = with lib; { From 30904448bf60d82075480b9c8c79ba8c8ccca4ec Mon Sep 17 00:00:00 2001 From: Archit Gupta Date: Sat, 29 Oct 2022 21:42:55 -0700 Subject: [PATCH 006/223] clightd: Add Yoctolight option The clightd package supports/enables all the available build options except for Yoctolight support. Yoctolight support requires no additional dependencies as libusb is already a dep. This enables Yoctolight support so that the package can be used on desktop systems with a Yoctolight module as the ALS. --- pkgs/applications/misc/clight/clightd.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index b9df45b482d5..d596a2444667 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -5,7 +5,8 @@ , enableDdc ? true, ddcutil , enableDpms ? true, libXext , enableGamma ? true, libdrm, libXrandr, wayland -, enableScreen ? true }: +, enableScreen ? true +, enableYoctolight ? true }: stdenv.mkDerivation rec { pname = "clightd"; @@ -33,10 +34,11 @@ stdenv.mkDerivation rec { "-DDBUS_CONFIG_DIR=${placeholder "out"}/etc/dbus-1/system.d" # systemd.pc has prefix=${systemd.out} "-DMODULE_LOAD_DIR=${placeholder "out"}/lib/modules-load.d" - ] ++ optional enableDdc "-DENABLE_DDC=1" - ++ optional enableDpms "-DENABLE_DPMS=1" - ++ optional enableGamma "-DENABLE_GAMMA=1" - ++ optional enableScreen "-DENABLE_SCREEN=1"; + ] ++ optional enableDdc "-DENABLE_DDC=1" + ++ optional enableDpms "-DENABLE_DPMS=1" + ++ optional enableGamma "-DENABLE_GAMMA=1" + ++ optional enableScreen "-DENABLE_SCREEN=1" + ++ optional enableYoctolight "-DENABLE_YOCTOLIGHT=1"; nativeBuildInputs = [ dbus From 5b42ce13ba8afa441c3a7f14c2a13b2062dc3350 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 30 Oct 2022 03:05:39 -0700 Subject: [PATCH 007/223] python3Packages.pdoc3: patch failing test --- pkgs/development/python-modules/pdoc3/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index ea0f20f5a4af..740ce08af4ec 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "5f22e7bcb969006738e1aa4219c75a32f34c2d62d46dc9d2fb2d3e0b0287e4b7"; + hash = "sha256-XyLnvLlpAGc44apCGcdaMvNMLWLUbcnS+y0+CwKH5Lc="; }; patches = [ @@ -25,7 +25,14 @@ buildPythonPackage rec { # test_Class_params fails in 0.10.0 # https://github.com/pdoc3/pdoc/issues/355 url = "https://github.com/pdoc3/pdoc/commit/4aa70de2221a34a3003a7e5f52a9b91965f0e359.patch"; - sha256 = "07sbf7bh09vgd5z1lbay604rz7rhg88414whs6iy60wwbvkz5c2v"; + hash = "sha256-W7Dy516cA+Oj0ZCTQBB6MJ+fCTBeLRp+aW8nANdxSx8="; + }) + # https://github.com/pdoc3/pdoc/issues/400 + (fetchpatch { + name = "fix-test-for-python310.patch"; + url = "https://github.com/pdoc3/pdoc/commit/80af5d40d3ca39e2701c44941c1003ae6a280799.patch"; + hash = "sha256-69Cn+BY7feisSHugONIF/PRgEDEfnvnS/RBHWv1P8/w="; + excludes = [".github/workflows/ci.yml"]; }) ]; @@ -40,7 +47,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Auto-generate API documentation for Python projects."; homepage = "https://pdoc3.github.io/pdoc/"; license = with licenses; [ agpl3Plus ]; From 7d163d83be405e8f33853cd966849ead83d1dbe6 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 16:30:02 +0000 Subject: [PATCH 008/223] glew: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `bin`, `dev` and `out` outputs with `diffoscope`. --- pkgs/development/libraries/glew/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 7e281892a1fd..94a2d2c967b1 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, fetchpatch, cmake, libGLU, libXmu, libXi, libXext , OpenGL , enableEGL ? false }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ xlibsWrapper libXmu libXi ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ libXmu libXi libXext ]; propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h cmakeDir = "cmake"; From 4bd4db0efe729615cf9a30e719a0ed5e14bceaef Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 30 Oct 2022 16:37:04 +0000 Subject: [PATCH 009/223] glew110: use xorg.* packages directly instead of xlibsWrapper indirection Tested as no material change in `dev` and `out` outputs with `diffoscope`. --- pkgs/development/libraries/glew/1.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index dadab6e610ff..c0c4d6fe0ce9 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi +{ lib, stdenv, fetchurl, libGLU, libXmu, libXi, libXext , AGL, OpenGL }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "01zki46dr5khzlyywr3cg615bcal32dazfazkf360s1znqh17i4r"; }; - buildInputs = if stdenv.isDarwin then [ AGL ] else [ xlibsWrapper libXmu libXi ]; + buildInputs = if stdenv.isDarwin then [ AGL ] else [ libXmu libXi libXext ]; propagatedBuildInputs = if stdenv.isDarwin then [ OpenGL ] else [ libGLU ]; # GL/glew.h includes GL/glu.h outputs = [ "out" "dev" ]; From af7cfd1e6ad04657609576d6d21be14632074aa6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 05:10:27 +0000 Subject: [PATCH 010/223] aws-c-s3: 0.1.50 -> 0.1.51 --- pkgs/development/libraries/aws-c-s3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-s3/default.nix b/pkgs/development/libraries/aws-c-s3/default.nix index 60db68153b7b..0692c5ef7abb 100644 --- a/pkgs/development/libraries/aws-c-s3/default.nix +++ b/pkgs/development/libraries/aws-c-s3/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-s3"; - version = "0.1.50"; + version = "0.1.51"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-s3"; rev = "v${version}"; - sha256 = "sha256-LFp7GkqdVXjOeeVD/4gOUK5chWcUMiepGoDLoN2XUok="; + sha256 = "sha256-10SDOl0XoALdSxJWHDLDkvX7rArUQKXjjXfAECFy/Vw="; }; nativeBuildInputs = [ From d36de99b5e63f2097a34972d111671d2098280f6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 06:10:11 +0000 Subject: [PATCH 011/223] aws-crt-cpp: 0.18.7 -> 0.18.9 --- pkgs/development/libraries/aws-crt-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 9247de33a35c..c7eac8474cb4 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.18.7"; + version = "0.18.9"; outputs = [ "out" "dev" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-a5LY5GndhpKl5hFWl5DT5sj8xe24w4CJCkVg97oNA7U="; + sha256 = "sha256-NEsEKUKmADevb8SSc8EFuXLc12fuOf6fXI76yVeDQno="; }; patches = [ From f5601482f15c4512073457cdee2d24c747938cf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Oct 2022 06:24:52 +0000 Subject: [PATCH 012/223] aws-c-io: 0.13.5 -> 0.13.6 --- pkgs/development/libraries/aws-c-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-io/default.nix b/pkgs/development/libraries/aws-c-io/default.nix index 072c180765c0..232efd2eec5c 100644 --- a/pkgs/development/libraries/aws-c-io/default.nix +++ b/pkgs/development/libraries/aws-c-io/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "aws-c-io"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "awslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7qNJMIG+bshtapm7uj+8ECSN9j0Bd1famSXp+i+67Uw="; + sha256 = "sha256-axFhFGeJhfqb4zu5u9an0pgpVDe+OyT+7A5SlAs502I="; }; nativeBuildInputs = [ cmake ]; From 740aa4255b610fa65dd1211910e29408c10e91cf Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 1 Nov 2022 11:34:01 +0000 Subject: [PATCH 013/223] tektoncd-cli: 0.24.1 -> 0.27.0 --- .../networking/cluster/tektoncd-cli/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index c3c6355cd0cf..0362095bce69 100644 --- a/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.24.1"; + version = "0.27.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-8dCmORfTMFHSyc9FOpL01ywxGcH3uolzD2aOtyy191Q="; + sha256 = "sha256-zLPZueKdUNauIzqXOV773SZ/RWg7UuMNeJHr7z6ZJ+E="; }; vendorSha256 = null; @@ -17,14 +17,15 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - # third_party/VENDOR-LICENSE breaks build/check as go files are still included - # docs is a tool for generating docs - excludedPackages = [ "third_party" "cmd/docs" ]; + subPackages = [ "cmd/tkn" ]; preCheck = '' # some tests try to write to the home dir export HOME="$TMPDIR" + # run all tests + unset subPackages + # the tests expect the clientVersion ldflag not to be set unset ldflags From 9b7282e97c5c3457682bdfe9252f74f603c4d8e5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 2 Nov 2022 13:51:11 +0100 Subject: [PATCH 014/223] ario: fix build on darwin --- pkgs/applications/audio/ario/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 68b74821ec3f..f9fedfcc28ff 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, autoreconfHook , pkg-config , intltool , avahi @@ -24,7 +25,14 @@ stdenv.mkDerivation rec { sha256 = "16nhfb3h5pc7flagfdz7xy0iq6kvgy6h4bfpi523i57rxvlfshhl"; }; - nativeBuildInputs = [ pkg-config gettext intltool wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gettext + intltool + wrapGAppsHook + ]; + buildInputs = [ avahi curl @@ -36,6 +44,12 @@ stdenv.mkDerivation rec { taglib ]; + postInstall = lib.optionalString stdenv.isDarwin '' + for file in $out/lib/ario/plugins/*.dylib; do + ln -s $file $out/lib/ario/plugins/$(basename $file .dylib).so + done + ''; + meta = with lib; { description = "GTK client for MPD (Music player daemon)"; homepage = "http://ario-player.sourceforge.net/"; From 7f38631b79b72abc224b26754117a8ee4dfd0bb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 16:18:14 +0000 Subject: [PATCH 015/223] tio: 2.1 -> 2.3 --- pkgs/tools/misc/tio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 2b737df6f94d..ff7c4143c2a9 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tio"; - version = "2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "tio"; repo = "tio"; rev = "v${version}"; - hash = "sha256-1GKwJylC57es2zM0ON3y4DLgJ7Q6bDYZW/L49U8GBLo="; + hash = "sha256-BjA9Zl6JcgDxTj4KPiWItSq9XuX9FJkpZnhdMBGZQpQ="; }; nativeBuildInputs = [ meson ninja cmake pkg-config inih bash-completion ]; From ad29005c504faeb34dac70ecd1bdac45138f44ca Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 22:53:58 +0100 Subject: [PATCH 016/223] arkpandora_ttf: add license --- lib/licenses.nix | 5 +++++ pkgs/data/fonts/arkpandora/default.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 4cd65277771f..c84d5e8706df 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -109,6 +109,11 @@ in mkLicense lset) ({ fullName = "Apache License 2.0"; }; + bitstreamVera = { + spdxId = "Bitstream-Vera"; + fullName = "Bitstream Vera Font License"; + }; + bola11 = { url = "https://blitiri.com.ar/p/bola/"; fullName = "Buena Onda License Agreement 1.1"; diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix index 827d7b0a5a44..259ac0141b2b 100644 --- a/pkgs/data/fonts/arkpandora/default.nix +++ b/pkgs/data/fonts/arkpandora/default.nix @@ -1,4 +1,4 @@ -{ fetchurl }: +{ lib, fetchurl }: let version = "2.04"; @@ -21,5 +21,6 @@ in fetchurl { meta = { description = "Font, metrically identical to Arial and Times New Roman"; + license = lib.licenses.bitstreamVera; }; } From 6832d459b395c05ce841efb0bb9c2bd5dabbf747 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:02:19 +0100 Subject: [PATCH 017/223] dosemu_fonts: add license --- pkgs/data/fonts/dosemu-fonts/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 81a1b5649b36..7de0e6d06027 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: +{ lib, stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { pname = "dosemu-fonts"; @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { meta = { description = "Various fonts from the DOSEmu project"; + license = lib.licenses.gpl2Only; }; } From 57e976051f17531573a2270c4ab9a5e66d19fcbe Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:10:06 +0100 Subject: [PATCH 018/223] tipa: add license --- pkgs/data/fonts/tipa/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/fonts/tipa/default.nix b/pkgs/data/fonts/tipa/default.nix index 53099f3e0b31..a0cc7106afe6 100644 --- a/pkgs/data/fonts/tipa/default.nix +++ b/pkgs/data/fonts/tipa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "tipa"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Phonetic font for TeX"; + license = lib.licenses.lppl13c; }; } From a68b0d4bc2e1321e47f28376e54d84e9528fc5b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:14:08 +0100 Subject: [PATCH 019/223] hicolor-icon-theme: add license --- pkgs/data/icons/hicolor-icon-theme/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 4fb1ada66540..096baa49acea 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -15,5 +15,6 @@ stdenvNoCC.mkDerivation rec { description = "Default fallback theme used by implementations of the icon theme specification"; homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; + license = licenses.gpl2Only; }; } From a00ba5367a3330e62305e2646877382e1c280a62 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:19:38 +0100 Subject: [PATCH 020/223] tango-icon-theme: add license --- pkgs/data/icons/tango-icon-theme/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 18676018eff4..a607748c7c38 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; - meta = { + meta = with lib; { description = "A basic set of icons"; homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; - platforms = lib.platforms.linux; + platforms = platforms.linux; + license = licenses.publicDomain; }; } From 4b55ceddca8926d1ba0cf9c94f0dbca6c5d6b23e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:28:22 +0100 Subject: [PATCH 021/223] dns-root-data: add license --- pkgs/data/misc/dns-root-data/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/misc/dns-root-data/default.nix b/pkgs/data/misc/dns-root-data/default.nix index e09ff07a9e84..abf945e9df55 100644 --- a/pkgs/data/misc/dns-root-data/default.nix +++ b/pkgs/data/misc/dns-root-data/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation { meta = with lib; { description = "DNS root data including root zone and DNSSEC key"; maintainers = with maintainers; [ fpletz vcunat ]; + license = licenses.gpl3Plus; }; } From ab49baf222bd841ce6351edc34e466dd30f6a780 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:45:06 +0100 Subject: [PATCH 022/223] indradb: fix license and fix meta tag --- pkgs/development/tools/database/indradb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/indradb/default.nix b/pkgs/development/tools/database/indradb/default.nix index eefb0a32525f..50f4d3222129 100644 --- a/pkgs/development/tools/database/indradb/default.nix +++ b/pkgs/development/tools/database/indradb/default.nix @@ -16,7 +16,7 @@ let meta = with lib; { description = "A graph database written in rust "; homepage = "https://github.com/indradb/indradb"; - license = licenses.asl20; + license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; platforms = platforms.unix; }; @@ -25,7 +25,7 @@ in indradb-server = rustPlatform.buildRustPackage { pname = "indradb-server"; version = "unstable-2021-01-05"; - inherit src; + inherit src meta; cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js="; @@ -43,7 +43,7 @@ in indradb-client = rustPlatform.buildRustPackage { pname = "indradb-client"; version = "unstable-2021-01-05"; - inherit src; + inherit src meta; cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM="; From f50fabb819e0ff893ec8e85588caf1365f020f25 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Nov 2022 23:53:04 +0100 Subject: [PATCH 023/223] luarocks-nix: fix meta data --- pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index ce689f0c1e26..916226ea0505 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -17,7 +17,7 @@ luarocks.overrideAttrs (old: { updateScript = unstableGitUpdater { }; }; - meta = { + meta = old.meta // { mainProgram = "luarocks"; }; }) From 0456dd51abf0ef3a3f2e174f488bca75e0f48264 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 23:13:17 +0000 Subject: [PATCH 024/223] aws-c-http: 0.6.22 -> 0.6.24 --- pkgs/development/libraries/aws-c-http/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-http/default.nix b/pkgs/development/libraries/aws-c-http/default.nix index 555647a771e9..73ed621c6516 100644 --- a/pkgs/development/libraries/aws-c-http/default.nix +++ b/pkgs/development/libraries/aws-c-http/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "aws-c-http"; - version = "0.6.22"; + version = "0.6.24"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${version}"; - sha256 = "sha256-wUaKLeIMu7iA+rXO6pVEJtE6Lxc5JIio3vZqhn9PV3M="; + sha256 = "sha256-sY0R9Hn0keX4djkHVXszCCfdqa+rzokTe18e5YH0fqs="; }; nativeBuildInputs = [ From 12428f3cf4ac7701340b09b1aa45a8eb60bc89d2 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 3 Nov 2022 07:44:02 +0000 Subject: [PATCH 025/223] waypipe: 0.8.3 -> 0.8.4 Changes: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases/v0.8.4 --- pkgs/applications/networking/remote/waypipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index 7a1dd8be40d5..ec94d504b9db 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "sha256-f1XEcDMy4skddtbZFFhCF4xg6zQahOLiGcYiJPy2SHs="; + sha256 = "sha256-ee3RKlcZQf8o8cQfz1ckiLDFNzdFJesBJKJTTrUmcpU="; }; strictDeps = true; From 071df1e1a958a5568c7f8968776a4512fc422255 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Nov 2022 09:30:39 +0100 Subject: [PATCH 026/223] python310Packages.prometheus-client: 0.14.1 -> 0.15.0 --- .../python-modules/prometheus-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix index 9b6653f2fa59..aacde11916e5 100644 --- a/pkgs/development/python-modules/prometheus-client/default.nix +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "prometheus-client"; - version = "0.14.1"; + version = "0.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "prometheus"; repo = "client_python"; - rev = "v${version}"; - sha256 = "sha256-hvBdWOMDuzF91Hv4u//tF+z6la0JfiTQHlpS4TnWpmk="; + rev = "refs/tags/v${version}"; + hash = "sha256-LabvQMNiRH4jclMnN0P4M3w25NQasNQEu1HWvRDQQ2o="; }; checkInputs = [ From 2396201a35276b40cacce65fbf683bec748f162d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Nov 2022 11:46:00 +0100 Subject: [PATCH 027/223] arpack: add optional MPI support --- .../libraries/science/math/arpack/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 9d96368a4cda..a1152598aa62 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,5 +1,13 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, gfortran, blas, lapack, eigen }: +, gfortran, blas, lapack, eigen +, useMpi ? false +, mpi +, openssh +}: + +# MPI version can only be built with LP64 interface. +# See https://github.com/opencollab/arpack-ng#readme +assert useMpi -> !blas.isILP64; stdenv.mkDerivation rec { pname = "arpack"; @@ -27,13 +35,16 @@ stdenv.mkDerivation rec { blas lapack eigen - ]; + ] ++ lib.optional useMpi mpi; + + checkInputs = lib.optional useMpi openssh; doCheck = true; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" + "-DMPI=${if useMpi then "ON" else "OFF"}" ]; preCheck = '' From 16943480e2a12d8ab5903e9772daba2737124c5a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Nov 2022 12:25:04 +0100 Subject: [PATCH 028/223] b2sum: fix build on aarch64 platforms --- pkgs/tools/security/b2sum/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/b2sum/default.nix b/pkgs/tools/security/b2sum/default.nix index e5de613bee7f..c915361ff209 100644 --- a/pkgs/tools/security/b2sum/default.nix +++ b/pkgs/tools/security/b2sum/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation { sha256 = "E60M9oP/Sdfg/L3ZxUcDtUXhFz9oP72IybdtVUJh9Sk="; }; + # Use the generic C implementation rather than the SSE optimised version on non-x86 platforms + postPatch = lib.optionalString (!stdenv.hostPlatform.isx86) '' + substituteInPlace makefile \ + --replace "#FILES=b2sum.c ../ref/" "FILES=b2sum.c ../ref/" \ + --replace "FILES=b2sum.c ../sse/" "#FILES=b2sum.c ../sse/" + ''; + sourceRoot = "source/b2sum"; buildInputs = [ openmp ]; @@ -25,7 +32,6 @@ stdenv.mkDerivation { homepage = "https://blake2.net"; license = with licenses; [ asl20 cc0 openssl ]; maintainers = with maintainers; [ kirelagin ]; - # "This code requires at least SSE2." - platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin; + platforms = platforms.unix; }; } From df19353be30798911efe0189a3dd478e62ee74b0 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Nov 2022 12:29:50 +0100 Subject: [PATCH 029/223] arpack: propagate isILP64 flag from BLAS --- pkgs/development/libraries/science/math/arpack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a1152598aa62..bdb386b9fe5c 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; + passthru = { inherit (blas) isILP64; }; + meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' From b931e2bb82cd268991cdd062e9c689981a9cb9cd Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Nov 2022 12:50:08 +0100 Subject: [PATCH 030/223] octopus: add arpack ILP64 check --- pkgs/applications/science/chemistry/octopus/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 8a97dc5f0c33..d0058c8650d8 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -8,6 +8,7 @@ }: assert (!blas.isILP64) && (!lapack.isILP64); +assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; From 8c3d2bab83369227d810f9fd49be36765e2b8b2c Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Nov 2022 12:50:25 +0100 Subject: [PATCH 031/223] calculix: add blas, lapack, arpack ILP64 checks --- pkgs/applications/science/math/calculix/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index df943277a627..4b0ae6f8ac9d 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,5 +1,9 @@ { lib, stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: +assert (blas.isILP64 == lapack.isILP64 && + blas.isILP64 == arpack.isILP64 && + !blas.isILP64); + stdenv.mkDerivation rec { pname = "calculix"; version = "2.19"; From 09a60c860b16b83649c4970149504d8db4cd737b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Nov 2022 12:54:12 +0100 Subject: [PATCH 032/223] igraph: add blas, lapack, arpack ILP64 checks --- pkgs/development/libraries/igraph/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index 69778f034829..9381f1b9ea30 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -21,6 +21,10 @@ , xmlto }: +assert (blas.isILP64 == lapack.isILP64 && + blas.isILP64 == arpack.isILP64 && + !blas.isILP64); + stdenv.mkDerivation rec { pname = "igraph"; version = "0.9.10"; From ad21c759d4be104650ba8d08cd6299fde0fa8c6d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Nov 2022 14:32:21 +0100 Subject: [PATCH 033/223] nixos/nextcloud: fix upgrade warning --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 4f7c26be6ab7..d524bee66c42 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -613,7 +613,7 @@ in { config = mkIf cfg.enable (mkMerge [ { warnings = let - latest = 24; + latest = 25; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. From d2fad4bebd8690090756bbcbdc06544bb522ee4e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Nov 2022 14:34:50 +0100 Subject: [PATCH 034/223] nextcloud24: 24.0.6 -> 24.0.7 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3ebaf0971174..3ff3fea4a82d 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -48,8 +48,8 @@ in { ''; nextcloud24 = generic { - version = "24.0.6"; - sha256 = "b26dff9980a47e7e722805fdbbf87e07f59a3817b03ecc32698e028e9baf0301"; + version = "24.0.7"; + sha256 = "a1c7344a4eb27260a9f6f6e6f586bdc4fb35e1e9330e1a6e8d46c05634db6384"; }; nextcloud25 = generic { From 126d3848ce7f813dbb4f194e02cf3a6ea10f6d92 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 3 Nov 2022 14:35:39 +0100 Subject: [PATCH 035/223] nextcloud25: 25.0.0 -> 25.0.1 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3ff3fea4a82d..7008a24d5ae2 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -53,8 +53,8 @@ in { }; nextcloud25 = generic { - version = "25.0.0"; - sha256 = "2c05ac9d7b72b44ef8b3d2ae03ff0fd6121e254b8054556f5163bd8760dd8f49"; + version = "25.0.1"; + sha256 = "72d4076924caf19139c40178597af6211799e20440ce196fb43b9c4e47d77515"; }; # tip: get the sha with: From 521e2f50891aac193068cda685f1352c01d06e28 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 3 Nov 2022 16:13:22 +0100 Subject: [PATCH 036/223] prl-tools: 18.0.3-53079 -> 18.1.0-53311 --- pkgs/os-specific/linux/prl-tools/default.nix | 10 +++------- .../os-specific/linux/prl-tools/prl-tools-6.0.patch | 13 ------------- 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 97c72750ebd0..e3d70f046756 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -24,20 +24,16 @@ assert (!libsOnly) -> kernel != null; stdenv.mkDerivation rec { - version = "18.0.3-53079"; + version = "18.1.0-53311"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "sha256-z9B2nhcTSZr3L30fa54zYi6WnonQ2wezHoneT2tQWAc="; + sha256 = "sha256-2ROPFIDoV2/sMVsVhcSyn0m1QVMCNb399WzKd/cozws="; }; - patches = lib.optionals (lib.versionAtLeast kernel.version "6.0") [ - ./prl-tools-6.0.patch - ]; - hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] @@ -51,7 +47,7 @@ stdenv.mkDerivation rec { inherit libsOnly; unpackPhase = '' - undmg "${src}" + undmg $src export sourceRoot=prl-tools-build 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch b/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch deleted file mode 100644 index f0bd00d24e0b..000000000000 --- a/pkgs/os-specific/linux/prl-tools/prl-tools-6.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -index baa8a19..6788791 100644 ---- a/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -+++ b/kmods/prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.c -@@ -306,7 +306,7 @@ int seq_show(struct seq_file *file, void *data) - char buf[BDEVNAME_SIZE]; - - fsb = list_entry((struct list_head*)data, struct frozen_sb, list); -- bdevname(fsb->sb->s_bdev, buf); -+ snprintf(buf, sizeof(buf), "%pg", fsb->sb->s_bdev); - seq_printf(file, "%s\n", buf); - return 0; - } From c470e3da0c64b13179099c47879ae0dc8ab21609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 23:13:34 +0000 Subject: [PATCH 037/223] aws-c-sdkutils: 0.1.3 -> 0.1.4 --- pkgs/development/libraries/aws-c-sdkutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-sdkutils/default.nix b/pkgs/development/libraries/aws-c-sdkutils/default.nix index 52a00229e979..22914b107b54 100644 --- a/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "aws-c-sdkutils"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-sdkutils"; rev = "v${version}"; - sha256 = "sha256-mbleTBNZegfYeaRgEup36+mAwYs/2FReA3gW2tp4ctk="; + sha256 = "sha256-B7BTafeN60csYhhscuHsynI183AvCqLljQgm8NgE6xo="; }; nativeBuildInputs = [ From c6fa94613f1f9bbf3fb536187bfeae78dab72417 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Nov 2022 03:15:02 +0100 Subject: [PATCH 038/223] espeakedit: migrate to wxGTK32 --- pkgs/applications/audio/espeak/edit.nix | 5 +-- .../audio/espeak/espeakedit-wxgtk30.patch | 32 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 2240a8561164..2c86a036ceb2 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK, sox }: +{ lib, stdenv, fetchurl, pkg-config, unzip, portaudio, wxGTK32, sox }: stdenv.mkDerivation rec { pname = "espeakedit"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config unzip ]; - buildInputs = [ portaudio wxGTK ]; + buildInputs = [ portaudio wxGTK32 ]; # TODO: # Uhm, seems like espeakedit still wants espeak-data/ in $HOME, even thought @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { ./espeakedit-configurable-sox-path.patch ./espeakedit-configurable-path-espeak-data.patch ./espeakedit-gcc6.patch + ./espeakedit-wxgtk30.patch ]; postPatch = '' diff --git a/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch b/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch new file mode 100644 index 000000000000..04e578824986 --- /dev/null +++ b/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch @@ -0,0 +1,32 @@ +diff -uNr a/src/espeakedit.cpp b/src/espeakedit.cpp +--- a/src/espeakedit.cpp ++++ b/src/espeakedit.cpp +@@ -123,7 +126,7 @@ bool MyApp::OnInit(void) + {//===================== + + int j; +-wxChar *p; ++const wxChar *p; + char param[120]; + + +diff -uNr a/src/spect.cpp b/src/spect.cpp +--- a/src/spect.cpp ++++ b/src/spect.cpp +@@ -1,6 +1,7 @@ + /*************************************************************************** + * Copyright (C) 2005 to 2007 by Jonathan Duddington * + * email: jonsd@users.sourceforge.net * ++ * Copyright (C) 2013 by Reece H. Dunn * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * +@@ -92,6 +93,8 @@ float SpectTilt(int value, int freq) + + + SpectFrame::SpectFrame(SpectFrame *copy) ++ : FONT_SMALL(8,wxSWISS,wxNORMAL,wxNORMAL) ++ , FONT_MEDIUM(9,wxSWISS,wxNORMAL,wxNORMAL) + {//===================================== + + int ix; From fcffb9c1ec8597fa6330f7c8baae2e0bafaebe7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 03:03:32 +0000 Subject: [PATCH 039/223] biblatex-check: 1.0.1 -> 1.0.2 --- pkgs/tools/typesetting/biblatex-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/biblatex-check/default.nix b/pkgs/tools/typesetting/biblatex-check/default.nix index c929d5901502..d3d3be0f430f 100644 --- a/pkgs/tools/typesetting/biblatex-check/default.nix +++ b/pkgs/tools/typesetting/biblatex-check/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "biblatex-check"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Pezmc"; repo = "BibLatex-Check"; rev = "v${version}"; - sha256 = "sha256-Pe6Ume7vH8WJG2EqOw31g3VYilfFsDBmNHtHcUXxqf0="; + sha256 = "sha256-8oHX56+kRWWl8t22DqLAFinjPngRMo3vXxXuVXBwutM="; }; buildInputs = [ python3 ]; From bdb03bc365e64fa077c4204f2eb9933044f2dc8c Mon Sep 17 00:00:00 2001 From: Rvfg Date: Fri, 4 Nov 2022 11:18:44 +0800 Subject: [PATCH 040/223] etebase-server: add option withPostgres --- pkgs/servers/etebase/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/etebase/default.nix b/pkgs/servers/etebase/default.nix index 1aab4a4591db..e84a3b45ce94 100644 --- a/pkgs/servers/etebase/default.nix +++ b/pkgs/servers/etebase/default.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, buildPythonPackage, aiofiles, django_3 , fastapi, msgpack, pynacl, redis, typing-extensions -, withLdap ? true, python-ldap }: +, withLdap ? true, python-ldap +, withPostgres ? true, psycopg2 }: buildPythonPackage rec { pname = "etebase-server"; @@ -24,7 +25,8 @@ buildPythonPackage rec { pynacl redis typing-extensions - ] ++ lib.optional withLdap python-ldap; + ] ++ lib.optional withLdap python-ldap + ++ lib.optional withPostgres psycopg2; installPhase = '' mkdir -p $out/bin $out/lib From e1a9cf2dc2c38c3b56cdd6a9de88fb6b8894dd0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 03:49:44 +0000 Subject: [PATCH 041/223] cargo-udeps: 0.1.33 -> 0.1.35 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index bb512e0eeff5..e178a70b310b 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.33"; + version = "0.1.35"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fl/4RsWHjWYJ76mD59m9Gcs2hz7bwnd0YWpZnVgMKjg="; + sha256 = "sha256-FVOrF90kgcxWmeyxBnmGyOwb1aycAQelqskOYYpAXhI="; }; - cargoSha256 = "sha256-kQwg1R+rvg2Tw27pTkrOi5QpPF3Q1woPsjac9RDYCyg="; + cargoSha256 = "sha256-JTRel8bOJbBdeDyJjO/xc+ZUQ1EunMPlyWeFrWrsVEI="; nativeBuildInputs = [ pkg-config ]; From 7ce8eb28f05dd831be9ce88198cca45fa7652419 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 042/223] nodejs-14_x: 14.21.0 -> 14.21.1 https://github.com/nodejs/node/releases/tag/v14.21.1 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 20f3f181b388..86358be5bcf0 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.21.0"; - sha256 = "sha256-O0vawbrMxUuu4uPbyre7Y1Ikxxbudu5Jqk9vVMKPeZE="; + version = "14.21.1"; + sha256 = "sha256-PbldbKcolXvwkLYwGnqdLYBxSyoG2Jih22XG5Csdp6w="; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } From a3d5f09dfd7134153136d3153820a0642898cc9d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 043/223] nodejs-16_x: 16.18.0 -> 16.18.1 https://github.com/nodejs/node/releases/tag/v16.18.1 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index a0586849cf75..a35c347c3d14 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "16.18.0"; - sha256 = "sha256-/P5q0jQPIpBh0+galN8Wf+P3fgFxLe3AFEoOfVjixps="; + version = "16.18.1"; + sha256 = "sha256-H4BRqI+G9CBk9EFf56mA5ZsKUC7Mje9YP2MDvE1EUjg="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ./bypass-darwin-xcrun-node16.patch From 57ea1f2119a2339e42e89d0412dc8b2a45086740 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 044/223] nodejs-18_x: 18.12.0 -> 18.12.1 https://github.com/nodejs/node/releases/tag/v18.12.1 --- pkgs/development/web/nodejs/v18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix index 142bf08bad7e..29f133a81105 100644 --- a/pkgs/development/web/nodejs/v18.nix +++ b/pkgs/development/web/nodejs/v18.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.12.0"; - sha256 = "sha256-c6fwHimZ6xl3Y87WZqbNVErVgOrvtz4KhJYDs+gE9C4="; + version = "18.12.1"; + sha256 = "sha256-T6QGRRvFJlmikOUs/bIWKnYL1UnaS4u+vmop8pbZON8="; patches = [ (fetchpatch { # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 From bf8eaefc86acc2f3867864d248a14d40db3798ec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 045/223] nodejs-19_x: 19.0.0 -> 19.0.1 https://github.com/nodejs/node/releases/tag/v19.0.1 --- pkgs/development/web/nodejs/v19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v19.nix b/pkgs/development/web/nodejs/v19.nix index cb34e1c919d8..b9aed788bcd3 100644 --- a/pkgs/development/web/nodejs/v19.nix +++ b/pkgs/development/web/nodejs/v19.nix @@ -8,8 +8,8 @@ let in buildNodejs { inherit enableNpm; - version = "19.0.0"; - sha256 = "sha256-C3LSB6WBXxznskezPL+aLIb20BJT+jmQyXROJdl1BQ0="; + version = "19.0.1"; + sha256 = "sha256-7OXCjOtHY/Xn8nb4ySUbNiHh+m5FyULnV8TRUfi/AW0="; patches = [ (fetchpatch { # Fixes cross compilation to aarch64-linux by reverting https://github.com/nodejs/node/pull/43200 From c36659c72bcc9201580097e371b40cb58c21f9fa Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 046/223] python310Packages.pglast: 3.15 -> 3.17 --- pkgs/development/python-modules/pglast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index b75eabf30270..8907cb456846 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.15"; + version = "3.17"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-xm4ySCqa+hHlgjdz8WwkHjevLc79YX/XRKKD/SdIttw="; + hash = "sha256-C2SWuX6Lt4R62rkNJ9qOoVK50j+TUkhoGUw+seWjTQw="; }; propagatedBuildInputs = [ From ce9cf5430ec5fccf1d5b7b9cbb8fec9c6a1ebe09 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 047/223] bundletool: 1.12.1 -> 1.13.0 https://github.com/google/bundletool/releases/tag/1.13.0 --- pkgs/development/tools/bundletool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index 97aae84e14d3..de4deed0606a 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-yn8Nz2f0UffzTrI+g1MoDpOYj7frq6/US86auYkcs3I="; + sha256 = "sha256-9Fks0DrUgk6N218pPvgAHrU0P9kjCOJhQx8ILzloC+I="; }; dontUnpack = true; From 159b0c0b67ef106b9e0b6d160ea8f05cd56f4044 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 048/223] python310Packages.scrapy: 2.7.0 -> 2.7.1 https://github.com/scrapy/scrapy/releases/tag/2.7.1 --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 988c0bf28c03..3571a783af8d 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.7.0"; + version = "2.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - hash = "sha256-Ssvg8fX7XqkTU1EriVjtMEvCX2373ig5oNh6SUNRWLk="; + hash = "sha256-MPpAg1PSSx35ed8upK+9GbSuAvsiB/IY0kYzLx4c8U4="; }; nativeBuildInputs = [ From d732cb923b4ce35502a825cfa6e22cac6bc5bdac Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 4 Nov 2022 04:20:00 +0000 Subject: [PATCH 049/223] python310Packages.flask-restx: 0.5.1 -> 1.0.3 https://github.com/python-restx/flask-restx/raw/1.0.3/CHANGELOG.rst --- .../python-modules/flask-restx/default.nix | 37 +++++-------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index c1e81a1801e5..6f7c83010eb1 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -1,14 +1,13 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch +, pythonOlder , aniso8601 , jsonschema , flask , werkzeug , pytz , faker -, six , mock , blinker , pytest-flask @@ -19,42 +18,24 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.5.1"; + version = "1.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "18vrmknyxw6adn62pz3kr9kvazfgjgl4pgimdf8527fyyiwcqy15"; + sha256 = "sha256-fodoGeVSNw4XZrVt907H20OJQIR8FlfINvEPWOkZQqI="; }; - patches = [ - # Fixes werkzeug 2.1 compatibility - (fetchpatch { - # https://github.com/python-restx/flask-restx/pull/427 - url = "https://github.com/python-restx/flask-restx/commit/bb72a51860ea8a42c928f69bdd44ad20b1f9ee7e.patch"; - hash = "sha256-DRH3lI6TV1m0Dq1VyscL7GQS26OOra9g88dXZNrNpmQ="; - }) - (fetchpatch { - # https://github.com/python-restx/flask-restx/pull/427 - url = "https://github.com/python-restx/flask-restx/commit/bb3e9dd83b9d4c0d0fa0de7d7ff713fae71eccee.patch"; - hash = "sha256-HJpjG4aQWzEPCMfbXfkw4mz5TH9d89BCvGH2dE6Jfv0="; - }) - # Fixes werkzeug 2.2 compatibility - (fetchpatch { - # https://github.com/python-restx/flask-restx/pull/463 - url = "https://github.com/python-restx/flask-restx/commit/82f7340ebb51e5c143b804bc0f20f785e96968c0.patch"; - hash = "sha256-GA+UlFDu771ul3qplsukce/mjGvJ3E4Dw/IoJQLevNU="; - }) - ]; - propagatedBuildInputs = [ aniso8601 flask jsonschema pytz - six werkzeug ]; @@ -75,11 +56,13 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; - pythonImportsCheck = [ "flask_restx" ]; + pythonImportsCheck = [ + "flask_restx" + ]; meta = with lib; { - homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; + homepage = "https://github.com/python-restx/flask-restx"; changelog = "https://github.com/python-restx/flask-restx/raw/${version}/CHANGELOG.rst"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; From a213b3a2e721e9faa7306e0e357417ec2be52642 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Fri, 4 Nov 2022 08:00:10 +0100 Subject: [PATCH 050/223] got: 0.77 -> 0.78 --- pkgs/applications/version-management/got/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/got/default.nix b/pkgs/applications/version-management/got/default.nix index b70fe634cb1e..3676de308e5b 100644 --- a/pkgs/applications/version-management/got/default.nix +++ b/pkgs/applications/version-management/got/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.77"; + version = "0.78"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "sha256-/O9u7Ei6f0rGr7LRWcG9FUQd7Z+qpq2/6H01jNR1C7o="; + sha256 = "sha256-fi0YF0YCOtzA02Ix42BU6fi1UKgF/X6mG3S0fP/ZwxE="; }; nativeBuildInputs = [ pkg-config bison ]; From 36a7a0097886daefc1de8a126a7480bd361928ed Mon Sep 17 00:00:00 2001 From: zachel Date: Fri, 4 Nov 2022 16:22:33 +0900 Subject: [PATCH 051/223] lite-xl: 2.0.5 -> 2.1.0 --- ...001-replace-unpack-with-table-unpack.patch | 91 ------------------- pkgs/applications/editors/lite-xl/default.nix | 13 +-- 2 files changed, 4 insertions(+), 100 deletions(-) delete mode 100644 pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch diff --git a/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch b/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch deleted file mode 100644 index e7a2287427f6..000000000000 --- a/pkgs/applications/editors/lite-xl/0001-replace-unpack-with-table-unpack.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/data/core/commands/findreplace.lua b/data/core/commands/findreplace.lua -index 5d27aa6..db6a2dd 100644 ---- a/data/core/commands/findreplace.lua -+++ b/data/core/commands/findreplace.lua -@@ -37,7 +37,7 @@ local function update_preview(sel, search_fn, text) - last_view:scroll_to_line(line2, true) - found_expression = true - else -- last_view.doc:set_selection(unpack(sel)) -+ last_view.doc:set_selection(table.unpack(sel)) - found_expression = false - end - end -@@ -55,7 +55,7 @@ end - local function find(label, search_fn) - last_view, last_sel = core.active_view, - { core.active_view.doc:get_selection() } -- local text = last_view.doc:get_text(unpack(last_sel)) -+ local text = last_view.doc:get_text(table.unpack(last_sel)) - found_expression = false - - core.command_view:set_text(text, true) -@@ -69,8 +69,8 @@ local function find(label, search_fn) - last_fn, last_text = search_fn, text - else - core.error("Couldn't find %q", text) -- last_view.doc:set_selection(unpack(last_sel)) -- last_view:scroll_to_make_visible(unpack(last_sel)) -+ last_view.doc:set_selection(table.unpack(last_sel)) -+ last_view:scroll_to_make_visible(table.unpack(last_sel)) - end - end, function(text) - update_preview(last_sel, search_fn, text) -@@ -79,8 +79,8 @@ local function find(label, search_fn) - end, function(explicit) - core.status_view:remove_tooltip() - if explicit then -- last_view.doc:set_selection(unpack(last_sel)) -- last_view:scroll_to_make_visible(unpack(last_sel)) -+ last_view.doc:set_selection(table.unpack(last_sel)) -+ last_view:scroll_to_make_visible(table.unpack(last_sel)) - end - end) - end -diff --git a/data/core/doc/init.lua b/data/core/doc/init.lua -index 2e72907..0e61ffb 100644 ---- a/data/core/doc/init.lua -+++ b/data/core/doc/init.lua -@@ -198,9 +198,9 @@ local function selection_iterator(invariant, idx) - local target = invariant[3] and (idx*4 - 7) or (idx*4 + 1) - if target > #invariant[1] or target <= 0 or (type(invariant[3]) == "number" and invariant[3] ~= idx - 1) then return end - if invariant[2] then -- return idx+(invariant[3] and -1 or 1), sort_positions(unpack(invariant[1], target, target+4)) -+ return idx+(invariant[3] and -1 or 1), sort_positions(table.unpack(invariant[1], target, target+4)) - else -- return idx+(invariant[3] and -1 or 1), unpack(invariant[1], target, target+4) -+ return idx+(invariant[3] and -1 or 1), table.unpack(invariant[1], target, target+4) - end - end - -@@ -345,7 +345,7 @@ function Doc:raw_insert(line, col, text, undo_stack, time) - - -- push undo - local line2, col2 = self:position_offset(line, col, #text) -- push_undo(undo_stack, time, "selection", unpack(self.selections)) -+ push_undo(undo_stack, time, "selection", table.unpack(self.selections)) - push_undo(undo_stack, time, "remove", line, col, line2, col2) - - -- update highlighter and assure selection is in bounds -@@ -357,7 +357,7 @@ end - function Doc:raw_remove(line1, col1, line2, col2, undo_stack, time) - -- push undo - local text = self:get_text(line1, col1, line2, col2) -- push_undo(undo_stack, time, "selection", unpack(self.selections)) -+ push_undo(undo_stack, time, "selection", table.unpack(self.selections)) - push_undo(undo_stack, time, "insert", line1, col1, text) - - -- get line content before/after removed text -diff --git a/data/core/tokenizer.lua b/data/core/tokenizer.lua -index d95baeb..f77fed4 100644 ---- a/data/core/tokenizer.lua -+++ b/data/core/tokenizer.lua -@@ -161,7 +161,7 @@ function tokenizer.tokenize(incoming_syntax, text, state) - if count % 2 == 0 then break end - end - until not res[1] or not close or not target[3] -- return unpack(res) -+ return table.unpack(res) - end - - while i <= #text do diff --git a/pkgs/applications/editors/lite-xl/default.nix b/pkgs/applications/editors/lite-xl/default.nix index b19c3f531b7a..11dd38752377 100644 --- a/pkgs/applications/editors/lite-xl/default.nix +++ b/pkgs/applications/editors/lite-xl/default.nix @@ -3,7 +3,7 @@ , Foundation , freetype , lib -, lua5_2 +, lua5_4 , meson , ninja , pcre2 @@ -15,26 +15,21 @@ stdenv.mkDerivation rec { pname = "lite-xl"; - version = "2.0.5"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lite-xl"; repo = "lite-xl"; rev = "v${version}"; - sha256 = "sha256-7ppO5ITijhJ37OL6xlQgu1SaQ/snXDH5xJOwuXZNUVA="; + sha256 = "sha256-9nQFdii6SY14Cul7Ki0DUEsu75HWTCeEZtXaU6KGRiM="; }; - patches = [ - # Fixes compatibility with Lua5.2, remove patch when a new release covers this - ./0001-replace-unpack-with-table-unpack.patch - ]; - nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ agg freetype - lua5_2 + lua5_4 pcre2 reproc SDL2 From 6a88d0d894c72c2ff5e90669edce2a6e33feb2a9 Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 4 Nov 2022 10:50:04 +0100 Subject: [PATCH 052/223] calibre: 6.7.1 -> 6.8.0 https://github.com/kovidgoyal/calibre/releases/tag/v6.8.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 049bada253c1..accfcfa2c237 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { pname = "calibre"; - version = "6.7.1"; + version = "6.8.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-B//rBsvOXA5UqGjd2MLcAhDFCvreI7UmtfEpuxaIsa0="; + hash = "sha256-d9JaWjAjJzKldjyrdrl6OyX1JSatp9U8agRog7K5n2s="; }; # https://sources.debian.org/patches/calibre/${version}+dfsg-1 From c405df3dce0864de442b86eeee7f7dfb3df93497 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 4 Nov 2022 10:00:59 +0000 Subject: [PATCH 053/223] witness: 0.1.11 -> 0.1.12 --- pkgs/tools/security/witness/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 78b7f32a61df..8a349ac9e28c 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -2,15 +2,16 @@ buildGoModule rec { pname = "witness"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/v6dltF4oCIOtN6Fcpf+VvT+c3vTB1q/IgGUqZzbcVk="; + sha256 = "sha256-MH4ByPoHZHIq2b/QGA/fFa3P1a28BbkaX/p48pwnl1Q="; }; - vendorSha256 = "sha256-UP68YNLX+fuCvd+e3rER1icha9bS3MemJLwJOMMOVfg="; + proxyVendor = true; + vendorSha256 = "sha256-CUiex+ljzpbkqbXCmOjO62YTcgqOIE9Cg3JB6CWUbsk="; nativeBuildInputs = [ installShellFiles ]; From fc29fad23a2c5406eeefef41c2c3418d95518f31 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Fri, 4 Nov 2022 07:19:43 -0400 Subject: [PATCH 054/223] python38Packages.scipy: fix build --- pkgs/development/python-modules/scipy/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index e791454b9018..f85121a39ac3 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchPypi , python +, pythonOlder , buildPythonPackage , cython , gfortran @@ -14,6 +15,7 @@ , pytest-xdist , numpy , pybind11 +, libxcrypt }: buildPythonPackage rec { @@ -28,7 +30,12 @@ buildPythonPackage rec { nativeBuildInputs = [ cython gfortran meson-python pythran pkg-config wheel ]; - buildInputs = [ numpy.blas pybind11 ]; + buildInputs = [ + numpy.blas + pybind11 + ] ++ lib.optionals (pythonOlder "3.9") [ + libxcrypt + ]; propagatedBuildInputs = [ numpy ]; From 18811a4431e9e6a32b125c0e7141292beac91751 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 11:35:35 +0000 Subject: [PATCH 055/223] libplctag: 2.5.2 -> 2.5.3 --- pkgs/development/libraries/libplctag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libplctag/default.nix b/pkgs/development/libraries/libplctag/default.nix index a569e881b988..e5d42f540a36 100644 --- a/pkgs/development/libraries/libplctag/default.nix +++ b/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-HBhVPHkr21iT78lE0FRydZAY7kkH1s/EWP7lsWFC0xA="; + sha256 = "sha256-v6Gp9C5r5WMFR+LAZPlUKQ4EiBDmbscPEKKDv7gaTEo="; }; nativeBuildInputs = [ cmake ]; From 088cd569cbc983f6e855583a823c5ef9089cf4b6 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Fri, 4 Nov 2022 12:42:08 +0100 Subject: [PATCH 056/223] sabnzbd: 3.6.1 -> 3.7.0 --- pkgs/servers/sabnzbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 4f320ff2c3a0..03d754eca733 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -24,14 +24,14 @@ let ]); path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "3.6.1"; + version = "3.7.0"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-xaryCwIJ3705T7znnJKQOfC87ceh8D4e00JCY6e/CI0="; + sha256 = "sha256-ngsNDxK3J8acrVqxtEnfoqEOhNsQemOcuaf3ru3eQMw="; }; nativeBuildInputs = [ makeWrapper ]; From 282901a0505ad496055ff715f4cfb77e5b43a27d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:51:09 +0000 Subject: [PATCH 057/223] linux: 4.14.296 -> 4.14.298 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index e94263de28e6..97fd9d525f37 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.296"; + version = "4.14.298"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d"; + sha256 = "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6"; }; } // (args.argsOverride or {})) From 267d467ecd5182a5e35d4a146217a15fb8b06f49 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:51:29 +0000 Subject: [PATCH 058/223] linux: 4.19.262 -> 4.19.264 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 7a4c0dff7ae6..902be54d30e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.262"; + version = "4.19.264"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v"; + sha256 = "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps"; }; } // (args.argsOverride or {})) From e3286850985325791b3afc682558f5cb580bb0c6 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:51:45 +0000 Subject: [PATCH 059/223] linux: 4.9.331 -> 4.9.332 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index f85b78a8f54f..c58e05b485e5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.331"; + version = "4.9.332"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0v3vv02i9aqgx4g4kw0vpixxsms7w3s5fhry4wlqmsq0gkmqv3j8"; + sha256 = "1kiqa9kw4932n5qglkyymsrak849wbbszw9rnq1aygmdinjz4c8i"; }; } // (args.argsOverride or {})) From ff99944b11d05376891e71c69ae2d9e661fd3e7a Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:52:06 +0000 Subject: [PATCH 060/223] linux: 5.10.152 -> 5.10.153 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index b80fce4f2d15..b918ef7c35f6 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.152"; + version = "5.10.153"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs"; + sha256 = "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw"; }; } // (args.argsOverride or {})) From b0c196f1489f00564621c6a7b73115281da072dc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:52:27 +0000 Subject: [PATCH 061/223] linux: 5.15.76 -> 5.15.77 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index a53e38fe3883..8dd899d0bac3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.76"; + version = "5.15.77"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh"; + sha256 = "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql"; }; } // (args.argsOverride or { })) From b44d44e951b122dbaee28d67232847daf1b51290 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:52:46 +0000 Subject: [PATCH 062/223] linux: 5.4.221 -> 5.4.223 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index d1da73804f42..f617ba6f0e3e 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.221"; + version = "5.4.223"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7"; + sha256 = "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y"; }; } // (args.argsOverride or {})) From 8bb699516f9b1f51070133e139423b74404e832d Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:53:09 +0000 Subject: [PATCH 063/223] linux: 6.0.6 -> 6.0.7 --- pkgs/os-specific/linux/kernel/linux-6.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.0.nix b/pkgs/os-specific/linux/kernel/linux-6.0.nix index 5213856218d3..0661da8d338e 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.0.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.0.6"; + version = "6.0.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6"; + sha256 = "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7"; }; } // (args.argsOverride or { })) From b43ea993265d5f05c665f96e823b32bf2aca75c3 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:53:19 +0000 Subject: [PATCH 064/223] linux_latest-libre: 18950 -> 18978 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 1814d4cee069..0a397d639360 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18950"; - sha256 = "1k84mqvi71bmd7x0km980z1y7cm71fc6jvnf2rzhxss9pjscrh2j"; + rev = "18978"; + sha256 = "12mvj5c2k774fpmixcv7i4ciw7xqjaxqd20ryn8xw8vgrnb4h6fi"; } , ... }: From b674b426d4801fed86f16868330427e92df3438c Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:53:49 +0000 Subject: [PATCH 065/223] linux/hardened/patches/4.14: 4.14.296-hardened1 -> 4.14.298-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index bfcfa874addc..c1bccc5619e9 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,12 +2,12 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.296-hardened1.patch", - "sha256": "1shbnrzdl0zpyq1wpd610l5xf0j1nsnbgd6yg88gjacgd2hpx143", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.296-hardened1/linux-hardened-4.14.296-hardened1.patch" + "name": "linux-hardened-4.14.298-hardened1.patch", + "sha256": "1gzp5fxyv5s029s6c9zrnvj3wb02blabmdmcziaqvf6k7k178prs", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.298-hardened1/linux-hardened-4.14.298-hardened1.patch" }, - "sha256": "1n4vngqbywwkqrq9fwp3lp4w6d3z588hbnzfngcp07z1ffrcvm9d", - "version": "4.14.296" + "sha256": "0w8f7m3mdj6gcxdvsvxw5hqqfhwffpfl794rgianl4r6iad8w7s6", + "version": "4.14.298" }, "4.19": { "patch": { From a2ddd1ac1ab04030971239b75d78c7ebd6a00f36 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:54:09 +0000 Subject: [PATCH 066/223] linux/hardened/patches/4.19: 4.19.262-hardened1 -> 4.19.264-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c1bccc5619e9..9a99b5ba7284 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -12,12 +12,12 @@ "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.262-hardened1.patch", - "sha256": "117l4azj4j6jydrgrjs96xgab0g3ail4q75hkyqn85if7bjjnymk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.262-hardened1/linux-hardened-4.19.262-hardened1.patch" + "name": "linux-hardened-4.19.264-hardened1.patch", + "sha256": "08swipghq66lx3nrww1319qwwgw3yipy5m4kvzpsz6mfhkm54aw9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.264-hardened1/linux-hardened-4.19.264-hardened1.patch" }, - "sha256": "07xnslqvmspqizng50yyprzrydwp0qdjmpsq2l1gjxr1lf3n8r5v", - "version": "4.19.262" + "sha256": "07ihf55y4xcbzpfgj9mxzchy1jmdpy46j32w15hac46a4504xcps", + "version": "4.19.264" }, "5.10": { "patch": { From 7791bbd54b119c30c56528d9da55b6d3a8703fc2 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:54:31 +0000 Subject: [PATCH 067/223] linux/hardened/patches/5.10: 5.10.152-hardened1 -> 5.10.153-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9a99b5ba7284..d978bfece421 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -22,12 +22,12 @@ "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.152-hardened1.patch", - "sha256": "0j5zbmhf1lf9b4xy11h48rl7vcj7jk4bx8phwkk2bvvrapv05r3j", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.152-hardened1/linux-hardened-5.10.152-hardened1.patch" + "name": "linux-hardened-5.10.153-hardened1.patch", + "sha256": "02kw33m0j10dnl30n17ppffqh8l8v91jpz1d1pkqipfw3j40j8az", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.153-hardened1/linux-hardened-5.10.153-hardened1.patch" }, - "sha256": "19nq2pgy4vmn30nywdvcvsx4vhmndrj97iiclpqakzgblj1mq2zs", - "version": "5.10.152" + "sha256": "0qhn5xv0m6baip1my1gp4mrjc4j6d6nbxa701vpwllg4kx8y9wiw", + "version": "5.10.153" }, "5.15": { "patch": { From 525ee05190d8ac080d9ba779a994f9dbc8e4df36 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:54:59 +0000 Subject: [PATCH 068/223] linux/hardened/patches/5.15: 5.15.76-hardened1 -> 5.15.77-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index d978bfece421..e1bdbd924edc 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -32,12 +32,12 @@ "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.76-hardened1.patch", - "sha256": "0wrrys0wbjczish6jp3mdcsrqph8bvid27cjfr6r7pvpzw9cwimi", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.76-hardened1/linux-hardened-5.15.76-hardened1.patch" + "name": "linux-hardened-5.15.77-hardened1.patch", + "sha256": "0pfa2xi64an716by3rqgn521a4igzb1y2bmbdn87icg8p79qavgx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.77-hardened1/linux-hardened-5.15.77-hardened1.patch" }, - "sha256": "0zymcp88654qk896djvc2ngdksvhkzh1ndhfk1dn5qqrqhha01wh", - "version": "5.15.76" + "sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql", + "version": "5.15.77" }, "5.4": { "patch": { From 451e251ea46776e4e48d240c582944fed6e27438 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:55:20 +0000 Subject: [PATCH 069/223] linux/hardened/patches/5.4: 5.4.221-hardened1 -> 5.4.223-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index e1bdbd924edc..fa0ccdbb8eff 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -42,12 +42,12 @@ "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.221-hardened1.patch", - "sha256": "19zp4pn8vbrgcnq1m9wck5ixs7247amwifngzb1630jniqhkrj0n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.221-hardened1/linux-hardened-5.4.221-hardened1.patch" + "name": "linux-hardened-5.4.223-hardened1.patch", + "sha256": "1jsnrxv9a16l5gdhbn7w4rc9ql7arggvcizmkdvnk7ymd6ni6518", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.223-hardened1/linux-hardened-5.4.223-hardened1.patch" }, - "sha256": "02nz9534998s922fdb0kpb09flgjmc7p78x0ypfxrd6pzv0pzcr7", - "version": "5.4.221" + "sha256": "1svyf4m5d3vrskylpal6npk5jj454rzij772wabg31v8vw97zw4y", + "version": "5.4.223" }, "6.0": { "patch": { From dab266f371936fc46c27b74c837820269be32108 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 4 Nov 2022 11:55:51 +0000 Subject: [PATCH 070/223] linux/hardened/patches/6.0: 6.0.6-hardened1 -> 6.0.7-hardened1 --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index fa0ccdbb8eff..a808338c9876 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,11 +52,11 @@ "6.0": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.0.6-hardened1.patch", - "sha256": "1p6l1ysxclp10bl3sd5kvzrp29kdqddk6hvy8dxydni1kysvf2j8", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.6-hardened1/linux-hardened-6.0.6-hardened1.patch" + "name": "linux-hardened-6.0.7-hardened1.patch", + "sha256": "0y1g4zahlq28s8grzzpxcccr7sjh6cgbviz880g1wqg7vmqpi1fz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.7-hardened1/linux-hardened-6.0.7-hardened1.patch" }, - "sha256": "1akzfkwjbxki6r41gcnp5fml389i8ng9bid9c4ysg6w65nphajw6", - "version": "6.0.6" + "sha256": "03srfv33r2vc48h051zicvn9hz78kc08vh7ljzlmcnk0g0mwrnk7", + "version": "6.0.7" } } From a3f5f537022b8bf4198fb1332ba1d6209c6f21dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 15:41:31 +0000 Subject: [PATCH 071/223] nixpacks: 0.11.6 -> 0.12.1 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index ca98669ba437..b913caa3b037 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.11.6"; + version = "0.12.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74="; + sha256 = "sha256-WSUkWb300D/FFsDBj8b+xrxQeQVxf265UU5PChV5Qhk="; }; - cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw="; + cargoSha256 = "sha256-ba06rs7OEBKQQ4VtwzXLcgGK8DLqu6ctQvOoQhAtwlc="; # skip test due FHS dependency doCheck = false; From 98550c8dfadfd12f263f80d8c924cd57d9c783b3 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Fri, 4 Nov 2022 11:41:42 -0400 Subject: [PATCH 072/223] wine-wayland: 7.0-rc2 -> 7.20 --- pkgs/applications/emulators/wine/base.nix | 1 + pkgs/applications/emulators/wine/sources.nix | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index d30fe6039ec1..699aa303462a 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -108,6 +108,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]) ++ lib.optionals waylandSupport (with pkgs; [ wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev + mesa # for libgbm ]))); patches = [ ] diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index b90ac2d07a87..0841729026a4 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -70,12 +70,13 @@ in rec { }; wayland = fetchFromGitLab rec { - version = "7.0-rc2"; - sha256 = "sha256-FU9L8cyIIfFQ+8f/AUg7IT+RxTpyNTuSfL0zBnur0SA="; + # https://gitlab.collabora.com/alf/wine/-/tree/wayland + version = "7.20"; + sha256 = "sha256-UrukAnlfrr6eeVwFSEOWSVSfyMHbMT1o1tfXxow61xY="; domain = "gitlab.collabora.com"; owner = "alf"; repo = "wine"; - rev = "95f0154c96a4b7d81e783ee5ba2f5d9cc7cda351"; + rev = "1dc9821ef0b6109c74d0c95cd5418caf7f9feaf1"; inherit (unstable) gecko32 gecko64; From df456957802bfc475b239fac5277e9b7b03c765e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 16:08:22 +0000 Subject: [PATCH 073/223] oh-my-posh: 12.10.0 -> 12.11.0 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 4e4987fa53df..3cf2de28112e 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.10.0"; + version = "12.11.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iPSaJL1mvPjzZjXtgqeFS1p1jlOqc6B/R1/Zwym0j3g="; + sha256 = "sha256-mvjuUABnK3l4BNrDicvUnYgf4ur8ZE15f/AqUlylcM8="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; From b9efaafce142169ae72210deb48534d4ed2af294 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:39:01 +0100 Subject: [PATCH 074/223] xmlcopyeditor: 1.2.1.3 -> 1.3.1.0 --- .../editors/xmlcopyeditor/default.nix | 47 +++++++++++++++---- .../editors/xmlcopyeditor/xmlcopyeditor.patch | 27 ++--------- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 43 insertions(+), 35 deletions(-) diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index d9bf7f52b2c4..bd7c237e8c13 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -1,28 +1,55 @@ -{ lib, stdenv, fetchurl, aspell, boost, expat, intltool, libxml2, libxslt, pcre, wxGTK, xercesc }: +{ lib +, stdenv +, fetchurl +, aspell +, boost +, expat +, intltool +, pkg-config +, libxml2 +, libxslt +, pcre2 +, wxGTK32 +, xercesc +, Cocoa +}: stdenv.mkDerivation rec { pname = "xmlcopyeditor"; - version = "1.2.1.3"; + version = "1.3.1.0"; src = fetchurl { - name = "${pname}-${version}.tar.gz"; url = "mirror://sourceforge/xml-copy-editor/${pname}-${version}.tar.gz"; - sha256 = "0bwxn89600jbrkvlwyawgc0c0qqxpl453mbgcb9qbbxl8984ns4v"; + sha256 = "sha256-6HHKl7hqyvF3gJ9vmjLjTT49prJ8KhEEV0qPsJfQfJE="; }; patches = [ ./xmlcopyeditor.patch ]; - CPLUS_INCLUDE_PATH = "${libxml2.dev}/include/libxml2"; - nativeBuildInputs = [ intltool ]; - buildInputs = [ aspell boost expat libxml2 libxslt pcre wxGTK xercesc ]; + nativeBuildInputs = [ + intltool + pkg-config + ]; + + buildInputs = [ + aspell + boost + expat + libxml2 + libxslt + pcre2 + wxGTK32 + xercesc + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; enableParallelBuilding = true; meta = with lib; { description = "A fast, free, validating XML editor"; - homepage = "http://xml-copy-editor.sourceforge.net/"; + homepage = "https://xml-copy-editor.sourceforge.io/"; license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ candeira ]; + platforms = platforms.unix; + maintainers = with maintainers; [ candeira wegank ]; }; } diff --git a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch b/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch index 253b9ce49ba8..1f35663bdad3 100644 --- a/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch +++ b/pkgs/applications/editors/xmlcopyeditor/xmlcopyeditor.patch @@ -1,17 +1,8 @@ -From 626c385ba141c6abcff01bef4451fcad062d232c Mon Sep 17 00:00:00 2001 -From: Javier Candeira -Date: Sat, 7 Apr 2018 20:21:45 +1000 -Subject: [PATCH] nixpckgs patches - ---- - src/Makefile.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - diff --git a/src/Makefile.in b/src/Makefile.in -index e75918f..e04703b 100644 +index e2b01fc..7f3a21e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in -@@ -283,8 +283,8 @@ top_srcdir = @top_srcdir@ +@@ -427,8 +427,8 @@ top_srcdir = @top_srcdir@ # these are the headers for your project noinst_HEADERS = $(srcdir)/*.h xmlcopyeditordir = ${prefix}/share/xmlcopyeditor @@ -21,16 +12,4 @@ index e75918f..e04703b 100644 +applicationsdir = ${prefix}/share/applications # the application source, library search path, and link libraries - xmlcopyeditor_SOURCES = aboutdialog.cpp associatedialog.cpp binaryfile.cpp \ -@@ -357,7 +357,7 @@ EXTRA_DIST = \ - $(srcdir)/xmlcopyeditor.rc \ - $(srcdir)/xmlschemaparser.cpp - --AM_CPPFLAGS = -I/usr/include/libxml2 $(ENCHANT_CFLAGS) $(GTK_CFLAGS) -+AM_CPPFLAGS = -I$(CPLUS_INCLUDE_PATH) $(ENCHANT_CFLAGS) $(GTK_CFLAGS) - all: all-am - - .SUFFIXES: --- -2.16.2 - + xmlcopyeditor_SOURCES = aboutdialog.cpp \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bff29234e410..51ea23e1e0b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33157,7 +33157,9 @@ with pkgs; xmenu = callPackage ../applications/misc/xmenu { }; - xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { }; + xmlcopyeditor = callPackage ../applications/editors/xmlcopyeditor { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; xmp = callPackage ../applications/audio/xmp { }; From 02dd2667d67eda0512640517244bdc975c0a4a75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 19:54:29 +0000 Subject: [PATCH 075/223] btrfs-progs: 6.0 -> 6.0.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 4263dc8aa243..799fa2345b30 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.0"; + version = "6.0.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-Rp4bLshCpuZISK5j3jAiRG+ACel19765GRkfE3y91TQ="; + sha256 = "sha256-tTFv/x2BHirToGeXMQnrkSuw2SgFc1Yl/YuC5wAgHEg="; }; nativeBuildInputs = [ From 4ff0738fd8f8fb833805f4083b92636c4b7fe649 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 20:09:47 +0000 Subject: [PATCH 076/223] awscli2: 2.8.8 -> 2.8.9 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index f9914483dc9b..8b4b42e31239 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -32,14 +32,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.8.8"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.8.9"; # N.B: if you change this, check if overrides are still up-to-date format = "pyproject"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-F8FqsLh+KU6YR1BsE1+UPOsLkr7ie10kXCYJS0DfDCQ="; + sha256 = "sha256-7So0zPknO5rIiWY7o82HXl+Iw2+fQmhYvrfrFMCDdDE="; }; nativeBuildInputs = [ From 124691a4cae083b898c0d902d5121820460a2461 Mon Sep 17 00:00:00 2001 From: Shaun Smiley Date: Fri, 4 Nov 2022 13:10:46 -0700 Subject: [PATCH 077/223] mutagen: 0.14.0 -> 0.16.0 --- pkgs/tools/misc/mutagen/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 83fdef4b95e1..2758b348610c 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen"; - version = "0.14.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OoRXf0QboRQkZE4zcwlGFyoToGOy1bbgGSo17BQLqCE="; + sha256 = "sha256-nKt/A1LIr+cPWASWFYiOebxsuWcbzd23CQ32GgnWvLA="; }; - vendorSha256 = "sha256-dkPpz0SZEAMPR7mq11kDHGCgeIpnXj2lRnJo1Ws32Cc="; + vendorSha256 = "sha256-feQOrZmJ656yD3HsxnN8JFXoP/XM2Gobyzj5MHyH/Xw="; agents = fetchzip { name = "mutagen-agents-${version}"; @@ -21,7 +21,7 @@ buildGoModule rec { postFetch = '' rm $out/mutagen # Keep only mutagen-agents.tar.gz. ''; - sha256 = "sha256-AlAo55/ewTE04WfS0beVonGA97AmpR1pAw/QxKAYjv8="; + sha256 = "sha256-QkleSf/Npbqrx2049tKxxwJk+996gM5AU/BIoyplDYo="; }; doCheck = false; From ed9bd02e77a8d0b2d8657b3d3c8acb8383ecabca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Nov 2022 21:29:56 +0100 Subject: [PATCH 078/223] httping: 2.5 -> 2.9 --- pkgs/tools/networking/httping/default.nix | 40 ++++++++++++++--------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index 77f2b52890e0..195f739aa5ae 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -1,26 +1,34 @@ -{ lib, stdenv, fetchurl, fetchpatch, gettext, libintl, ncurses, openssl -, fftw ? null }: +{ lib +, stdenv +, fetchFromGitHub +, fftw ? null +, gettext +, libintl +, ncurses +, openssl +}: stdenv.mkDerivation rec { pname = "httping"; - version = "2.5"; + version = "2.9"; - src = fetchurl { - url = "https://vanheusden.com/httping/${pname}-${version}.tgz"; - sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y"; + src = fetchFromGitHub { + owner = "folkertvanheusden"; + repo = "HTTPing"; + rev = "v${version}"; + hash = "sha256-aExTXXtW03UKMuMjTMx1k/MUpcRMh1PdSPkDGH+Od70="; }; - patches = [ - # Upstream fix for ncurses-6.3. - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/folkertvanheusden/HTTPing/commit/4ea9d5b78540c972e3fe1bf44db9f7b3f87c0ad0.patch"; - sha256 = "0w3kdkq6c6hz1d9jjnw0ldvd6dy39yamj8haf0hvcyb1sb67qjmp"; - }) + nativeBuildInputs = [ + gettext ]; - buildInputs = [ fftw libintl ncurses openssl ]; - nativeBuildInputs = [ gettext ]; + buildInputs = [ + fftw + libintl + ncurses + openssl + ]; makeFlags = [ "DESTDIR=$(out)" @@ -36,7 +44,7 @@ stdenv.mkDerivation rec { the transmission across the network also takes time! So it measures the latency of the webserver + network. It supports IPv6. ''; - license = licenses.agpl3; + license = licenses.agpl3Only; maintainers = []; platforms = platforms.linux ++ platforms.darwin; }; From f432eecba77bd1df377efb4ce5ef13bb37213a41 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 4 Nov 2022 21:34:22 +0100 Subject: [PATCH 079/223] chromiumBeta: 108.0.5359.22 -> 108.0.5359.30 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 060c9f53361b..b1b0c5605df3 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": "108.0.5359.22", - "sha256": "1wwrwqyl9nl4kpkmkybw14ygj5lfrk274yx5f817ha1kpk8vma0y", - "sha256bin64": "0dq3mf1rai7i3aqq9h8g4iy9nxy3hbb6gd86c31admxygdpgpds5", + "version": "108.0.5359.30", + "sha256": "1sxvlmz9k6r3qmlpljlis3p7vac26k62w21n8x29733hsq3hdra7", + "sha256bin64": "03x79s394xzwncfcgc4lw825q15i1ww2kmy2y7lcld9h52qyns8q", "deps": { "gn": { "version": "2022-10-05", From fe2fe7c588e88da98488db7c7b777076a27215da Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 4 Nov 2022 21:34:22 +0100 Subject: [PATCH 080/223] chromiumDev: 109.0.5384.0 -> 109.0.5396.2 --- .../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 060c9f53361b..3bcb2ab72979 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": "109.0.5384.0", - "sha256": "195lbklp5c6bvfzhdvah4k2yr44jwy64499y37kgxky0mb79a26n", - "sha256bin64": "02qbwj9gfcgxdqm1mhxg0mljvrhnl994lhis615y23099r3r67i8", + "version": "109.0.5396.2", + "sha256": "0a4pd365i8wj608n9d6624mf11491px1x0wv4673m3nkj1k8sqld", + "sha256bin64": "1gk7wi20h11bwsfch67xazjk9grxj6ax6vjyz7ihrlajdahdaf0w", "deps": { "gn": { - "version": "2022-10-26", + "version": "2022-10-28", "url": "https://gn.googlesource.com/gn", - "rev": "3e98c606ed0dff59fa461fbba4892c0b6de1966e", - "sha256": "08cz58svkb7c71f1x1ahr60a6ircr31rfmkk4d46z2v39sgry1gv" + "rev": "a4d67be044b42963de801001e7146f9657c7fad4", + "sha256": "0wikkkx503ip5xr72bz6d6sh2k50h5wlz9y8vmasvnrz9kjmlv5b" } } }, From f0c1d179544ffdee036923380352b8fc7118f44f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 4 Nov 2022 21:58:12 +0000 Subject: [PATCH 081/223] libpulsar: 2.10.1 -> 2.10.2 --- pkgs/development/libraries/libpulsar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index 3ad5c16d352d..76e379b45a6e 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -51,10 +51,10 @@ let in stdenv.mkDerivation rec { pname = "libpulsar"; - version = "2.10.1"; + version = "2.10.2"; src = fetchurl { - hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY="; + hash = "sha256-IONnsSDbnX2qz+Xya0taHYSViTOiRI36AfcxmY3dNpo="; url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; }; From 85a56fd394d4d2d9155cf116c2d05d9ab8babd06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Nov 2022 23:38:51 +0100 Subject: [PATCH 082/223] python310Packages.shtab: 1.5.6 -> 1.5.7 --- pkgs/development/python-modules/shtab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shtab/default.nix b/pkgs/development/python-modules/shtab/default.nix index 4e8ba675b9c1..24a29318170f 100644 --- a/pkgs/development/python-modules/shtab/default.nix +++ b/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.6"; + version = "1.5.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0="; + hash = "sha256-BIUUg+Y6bbgjnIWPU/bZO2axSLSzIsRJwyu7lBVQz/Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From f763c6f6e41a1a195db3fda629dd29d140fe4fbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Nov 2022 23:55:03 +0100 Subject: [PATCH 083/223] python310Packages.slither-analyzer: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index bb6ffcad0005..303d385bbc42 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "slither"; rev = "refs/tags/${version}"; - hash = "sha256-Td7WBPpc+ZYlFroZNzvUqQZJag0lbkCgj8TVOPrAAPY="; + hash = "sha256-u9uA4eq6gYQXHhZ1ruk1vkEIRTKsgN87zENuR1Fhew4="; }; nativeBuildInputs = [ From c72114dd062010adcc3ed1adab3c8de65fd9f659 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:48:33 +0100 Subject: [PATCH 084/223] python310Packages.jsonmerge: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/jsonmerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 3cea64594200..de9656d01ccd 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jsonmerge"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558"; + sha256 = "sha256-otH4ACHFwdcKSeMfhitfBo+dsGYIDYVh6AZU3nSjWE0="; }; propagatedBuildInputs = [ jsonschema ]; From 0411577c3e4cfefdb7722e1f317d2bb5c4685873 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:58:16 +0100 Subject: [PATCH 085/223] python310Packages.mockupdb: switch to pytestCheckHook - disable failing tests --- .../python-modules/mockupdb/default.nix | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mockupdb/default.nix b/pkgs/development/python-modules/mockupdb/default.nix index 47107f0617be..ddd72e7e7c1a 100644 --- a/pkgs/development/python-modules/mockupdb/default.nix +++ b/pkgs/development/python-modules/mockupdb/default.nix @@ -1,19 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , pymongo +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "mockupdb"; version = "1.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - sha256 = "d36d0e5b6445ff9141e34d012fa2b5dfe589847aa1e3ecb8d774074962af944e"; + hash = "sha256-020OW2RF/5FB400BL6K13+WJhHqh4+y413QHSWKvlE4="; }; - propagatedBuildInputs = [ pymongo ]; + propagatedBuildInputs = [ + pymongo + ]; - pythonImportsCheck = [ "mockupdb" ]; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mockupdb" + ]; + + disabledTests = [ + # AssertionError: expected to receive Request(), got nothing + "test_flags" + "test_iteration" + "test_ok" + "test_ssl_basic" + "test_unix_domain_socket" + ]; meta = with lib; { description = "Simulate a MongoDB server"; From 665eb10e24fda32b51445835d80eee9d16ab1235 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:05:17 +0100 Subject: [PATCH 086/223] python310Packages.asyncio-mqtt: 0.12.1 -> 0.13.0 --- .../python-modules/asyncio_mqtt/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/asyncio_mqtt/default.nix b/pkgs/development/python-modules/asyncio_mqtt/default.nix index a87bca439643..6a52ff4fd2d1 100644 --- a/pkgs/development/python-modules/asyncio_mqtt/default.nix +++ b/pkgs/development/python-modules/asyncio_mqtt/default.nix @@ -1,31 +1,37 @@ { lib , buildPythonPackage -, pythonOlder -, fetchPypi -, async_generator +, fetchFromGitHub , paho-mqtt +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "asyncio-mqtt"; - version = "0.12.1"; + version = "0.13.0"; format = "setuptools"; - src = fetchPypi { - pname = "asyncio_mqtt"; - inherit version; - sha256 = "sha256-bb+FpF+U0m50ZUEWgK2jlHtQVG6YII1dUuegp+16fDg="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "sbtinstruments"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-On4N5KPnbwYrJguWwBdrnaNq58ZeGIPYSFzIRBfojpQ="; }; propagatedBuildInputs = [ paho-mqtt - ] ++ lib.optionals (pythonOlder "3.7") [ - async_generator + ] ++ lib.optionals (pythonOlder "3.10") [ + typing-extensions ]; - doCheck = false; # no tests + # Module will have tests starting with > 0.13.0 + doCheck = false; - pythonImportsCheck = [ "asyncio_mqtt" ]; + pythonImportsCheck = [ + "asyncio_mqtt" + ]; meta = with lib; { description = "Idomatic asyncio wrapper around paho-mqtt"; From 8e09c0271ca4602ef45d99b5bb2d86dcb8b58943 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:05:37 +0100 Subject: [PATCH 087/223] python310Packages.aiomysensors: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/aiomysensors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomysensors/default.nix b/pkgs/development/python-modules/aiomysensors/default.nix index b2888a92d256..bbbaa7361c69 100644 --- a/pkgs/development/python-modules/aiomysensors/default.nix +++ b/pkgs/development/python-modules/aiomysensors/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "aiomysensors"; - version = "0.3.1"; + version = "0.3.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = pname; rev = "v${version}"; - hash = "sha256-uzVtgJ4R2MK6lqruvmoqgkzVCLhjyaEV92X6U6+lwG4="; + hash = "sha256-XPvnZOshA+PdFOzOlJXMfRTRYSue0uHsNwQsCwv3WOU="; }; nativeBuildInputs = [ From cd7b1e6e3a733d65e8279eb06a13695ec83e0ff1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:22:29 +0100 Subject: [PATCH 088/223] python310Packages.python-stdnum: don't run doctests --- .../python-modules/python-stdnum/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index bb809674e830..51ac732b1729 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,23 +1,34 @@ -{ lib, fetchPypi, buildPythonPackage, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { - version = "1.17"; pname = "python-stdnum"; + version = "1.17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "374e2b5e13912ccdbf50b0b23fca2c3e0531174805c32d74e145f37756328340"; + hash = "sha256-N04rXhORLM2/ULCyP8osPgUxF0gFwy104UXzd1Yyg0A="; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - nosetests - ''; + pythonImportsCheck = [ + "stdnum" + ]; - meta = { - homepage = "https://arthurdejong.org/python-stdnum/"; + meta = with lib; { description = "Python module to handle standardized numbers and codes"; - maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.lgpl2Plus; + homepage = "https://arthurdejong.org/python-stdnum/"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ johbo ]; }; } From d8812b6746923601fedc22a427ee25f84f347030 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:30:36 +0100 Subject: [PATCH 089/223] python310Packages.whois: 0.9.16 -> 0.9.17 --- pkgs/development/python-modules/whois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whois/default.nix b/pkgs/development/python-modules/whois/default.nix index 51ed08fe4ced..78f8a0147281 100644 --- a/pkgs/development/python-modules/whois/default.nix +++ b/pkgs/development/python-modules/whois/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "whois"; - version = "0.9.16"; + version = "0.9.17"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "DannyCork"; repo = "python-whois"; rev = "refs/tags/${version}"; - sha256 = "sha256-tpgRBTA+0c0F5XA+dusqPHlegV5r2Ny7AZeRBvS1pcQ="; + sha256 = "sha256-r77M0IxZ72Sl5c6rA7z8EdZ6rYS/oMrdvdt/E/Pw7nQ="; }; propagatedBuildInputs = [ From ec3c0418a513632a95df73d781f558fd9b9c3f08 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:40:54 +0100 Subject: [PATCH 090/223] python310Packages.google-cloud-appengine-logging: 1.1.5 -> 1.1.6 --- .../python-modules/google-cloud-appengine-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index bab843f81ccf..4dedba76ff44 100644 --- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.5"; + version = "1.1.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/zKQX6olZS0yl1yAu7Hguj87GUCiPfuf9oamobFHxjw="; + hash = "sha256-N0d/8lqqLT4IXbg0QpxchtJ4PmBOvXc4yGkvNhvHyJc="; }; propagatedBuildInputs = [ From a913371b15713e5f9e1f68136cd2af823ca6c644 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 01:44:04 +0100 Subject: [PATCH 091/223] python310Packages.canonicaljson: 1.6.3 -> 1.6.4 --- pkgs/development/python-modules/canonicaljson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 4600e0c1e6b6..3e88db6c915b 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "canonicaljson"; - version = "1.6.3"; + version = "1.6.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yll2C8J0qJmg2nWAnWkJrkPlEjOB/W7wQKRNGVLAtEg="; + hash = "sha256-bAmyEZUR8w6xEmz82XOhCCTiDxz9JQOc3j0SGN2cjY8="; }; nativeBuildInputs = [ From 7b9bb27e082211b422787489384cbe31c0abf096 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Tue, 27 Sep 2022 01:10:54 -0700 Subject: [PATCH 092/223] starship: reenable default features on darwin --- pkgs/tools/misc/starship/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index fdee67de119b..e25ee09af6bf 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , rustPlatform , installShellFiles -, libiconv , cmake , fetchpatch , nixosTests @@ -20,16 +19,14 @@ rustPlatform.buildRustPackage rec { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-90mh8C52uD68K5o1LE22gkbL1gy6FyMJTiiN9oV/3DE="; + hash = "sha256-90mh8C52uD68K5o1LE22gkbL1gy6FyMJTiiN9oV/3DE="; }; nativeBuildInputs = [ installShellFiles cmake ]; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security Foundation Cocoa ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security Foundation Cocoa ]; - buildNoDefaultFeatures = true; - # the "notify" feature is currently broken on darwin - buildFeatures = if stdenv.isDarwin then [ "battery" ] else [ "default" ]; + NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; postInstall = '' installShellCompletion --cmd starship \ @@ -38,7 +35,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoSha256 = "sha256-Q1VY9RyHEsQAWRN/upeG5XJxJfrmzj5FQG6GBGrN0xU="; + cargoHash = "sha256-Q1VY9RyHEsQAWRN/upeG5XJxJfrmzj5FQG6GBGrN0xU="; preCheck = '' HOME=$TMPDIR From 2b4a5cf5c13b4dca16eb7cf50423116226e4b67f Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 4 Nov 2022 21:03:39 -0400 Subject: [PATCH 093/223] cargo-nextest: 0.9.42 -> 0.9.43, add figsoda as a maintainer --- .../tools/rust/cargo-nextest/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 01d0a5f6a4a1..fb6e0d4f5f23 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -1,31 +1,28 @@ -{ lib, fetchFromGitHub, rustPlatform, stdenv, Security }: +{ lib, rustPlatform, fetchFromGitHub, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.42"; + version = "0.9.43"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-tNfJJfNjaeMszO5dGBvJfq7Hb0Sxc6DbRhYvpIjpCU0="; + sha256 = "sha256-7Ujm5xqgyw4/P/XBZKh9yE9sWz9n+WmZbGdmif9oK+w="; }; - cargoSha256 = "sha256-wEm1ooNZGDeMwJNGGL1bPMeBqL9VjxXlKVgmshNUUoo="; + cargoSha256 = "sha256-S46W+6+FyjI8BrdedDCzHHK+j3EyofQ9u8Ut1yr1/TI="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoTestFlags = [ # TODO: investigate some more why these tests fail in nix - "--" - "--skip=tests_integration::test_relocated_run" - "--skip=tests_integration::test_run" - "--skip=tests_integration::test_run_after_build" - ]; + cargoBuildFlags = [ "-p" "cargo-nextest" ]; + cargoTestFlags = [ "-p" "cargo-nextest" ]; meta = with lib; { description = "Next-generation test runner for Rust projects"; homepage = "https://github.com/nextest-rs/nextest"; + changelog = "https://nexte.st/CHANGELOG.html"; license = with licenses; [ mit asl20 ]; - maintainers = [ maintainers.ekleog ]; + maintainers = with maintainers; [ ekleog figsoda ]; }; } From 1dd8696f96db47156e1424a49578fe7dd4ce99a4 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 4 Nov 2022 17:06:51 -0700 Subject: [PATCH 094/223] vector: 0.24.1 -> 0.25.0 --- pkgs/tools/misc/vector/default.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 2fb2f82ba80f..d6c589ee2ed0 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -32,7 +32,7 @@ let pname = "vector"; - version = "0.24.1"; + version = "0.25.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -41,28 +41,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-RfKg14r3B5Jx2vIa4gpJs5vXRqSXKOXKRFmmQmzQorQ="; + hash = "sha256-2hCgHf7iBPl9BQITXyUDwgAz/i2HhXT4eczWrExCUDk="; }; - patches = [ - (fetchpatch { - name = "rust-1.64-part1.patch"; - url = "https://github.com/vectordotdev/vector/commit/e7437df97711b6a660a3532fe5026244472a900f.patch"; - hash = "sha256-EyheI3nngt72+ZZNNsjp3KV1CuRb9CZ7wUCHt0twFVs="; - }) - (fetchpatch { - name = "rust-1.64-part2.patch"; - url = "https://github.com/vectordotdev/vector/commit/e80c7afaf7601cf936c7c3468bd7b4b230ef6149.patch"; - hash = "sha256-pHcq7XLn+9PKs0DnBTK5FawN5KSF8BuJf7sBO9u5Gb8="; - excludes = [ - # There are too many conflicts to easily resolve patching this file, but - # the changes here do not block compilation. - "lib/lookup/src/lookup_v2/owned.rs" - ]; - }) - ]; - - cargoHash = "sha256-l2rrT2SeeH4bYYlzSiFASNBxtg4TBm1dRA4cFRfvpkk="; + cargoHash = "sha256-E23m8/XCEXeEpz1itIzCit9RpoB1/PRrYVWxt+VVfxA="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From d0850781b3f71ad1a3b63eace9b2cd9635f87737 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 01:13:36 +0000 Subject: [PATCH 095/223] rtsp-simple-server: 0.20.1 -> 0.20.2 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index af1826dfd635..12798b8ed504 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.20.1"; + version = "0.20.2"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-9tstGrl+5OzHUtoY1OREPT0zTDmUg8JkyzUzraLdAFA="; + hash = "sha256-diBMOVEZYKQlGBTU6pZpc1pG71Ad0qbXc+NLLxTczFk="; }; - vendorSha256 = "sha256-tmIM7X6sdeA6h4wAGb1RRgkqIjpcgVNq4oMwHZIB4W8="; + vendorSha256 = "sha256-62Jayh1blz5tbRtYxpPaSCJkRgpaTIcmw7lCuJ0JtIU="; # Tests need docker doCheck = false; From 98cb415b958c0ee747035a758bcb3bc2fa833e30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 01:27:10 +0000 Subject: [PATCH 096/223] shiv: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/shiv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 67610774f4b0..8038e0f2f000 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "shiv"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BDSfgXSythWUrwVnsg27rHN0nsfumFdX/2e62h239UY="; + sha256 = "sha256-vxRv8/Oryi6xIU6GAY82EkocItk1QO71JAMhys19f1c="; }; propagatedBuildInputs = [ click pip setuptools wheel ]; From 01ff1dd23fc146dbb5a843c832af61fdefe3d6eb Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 23 Aug 2022 14:40:24 +0900 Subject: [PATCH 097/223] logrotate service: cleanup deprecated options --- .../from_md/release-notes/rl-2205.section.xml | 7 +- .../from_md/release-notes/rl-2211.section.xml | 9 + .../manual/release-notes/rl-2205.section.md | 4 +- .../manual/release-notes/rl-2211.section.md | 4 + nixos/modules/services/logging/logrotate.nix | 183 +----------------- nixos/modules/services/misc/gitlab.nix | 11 +- nixos/tests/logrotate.nix | 29 --- 7 files changed, 23 insertions(+), 224 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 6f06838833eb..97e993e83ff0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -2526,10 +2526,9 @@ sudo cp /var/lib/redis/dump.rdb /var/lib/redis-peertube/dump.rdb The logrotate module also has been updated to freeform syntax: - services.logrotate.paths - and - services.logrotate.extraConfig - will work, but issue deprecation warnings and + services.logrotate.paths and + services.logrotate.extraConfig will work, + but issue deprecation warnings and services.logrotate.settings should now be used instead. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index f36b2cda538c..b731b8b72a3d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -507,6 +507,15 @@ [ "all" ]. + + + Deprecated settings logrotate.paths and + logrotate.extraConfig have been removed. + Please convert any uses to + services.logrotate.settings + instead. + + The isPowerPC predicate, found on diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 6fe5eba212f3..217aa6056cad 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -906,8 +906,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [services.logrotate.enable](#opt-services.logrotate.enable) now defaults to true if any rotate path has been defined, and some paths have been added by default. -- The logrotate module also has been updated to freeform syntax: [services.logrotate.paths](#opt-services.logrotate.paths) - and [services.logrotate.extraConfig](#opt-services.logrotate.extraConfig) will work, but issue deprecation +- The logrotate module also has been updated to freeform syntax: `services.logrotate.paths` + and `services.logrotate.extraConfig` will work, but issue deprecation warnings and [services.logrotate.settings](#opt-services.logrotate.settings) should now be used instead. - `security.pam.ussh` has been added, which allows authorizing PAM sessions based on SSH _certificates_ held within an SSH agent, using [pam-ussh](https://github.com/uber/pam-ussh). diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 8b24a6146270..0f0e3c7a2e55 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -171,6 +171,10 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). This got partially copied over from the minimal profile and reduces the final system size by up to 200MB. If you require all locales installed set the option to ``[ "all" ]``. +- Deprecated settings `logrotate.paths` and `logrotate.extraConfig` have + been removed. Please convert any uses to + [services.logrotate.settings](#opt-services.logrotate.settings) instead. + - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. - The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice. diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 5ea54a4cf921..b597ff9f5299 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -5,93 +5,9 @@ with lib; let cfg = config.services.logrotate; - # deprecated legacy compat settings - # these options will be removed before 22.11 in the following PR: - # https://github.com/NixOS/nixpkgs/pull/164169 - pathOpts = { name, ... }: { - options = { - enable = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to enable log rotation for this path. This can be used to explicitly disable - logging that has been configured by NixOS. - ''; - }; - - name = mkOption { - type = types.str; - internal = true; - }; - - path = mkOption { - type = with types; either str (listOf str); - default = name; - defaultText = "attribute name"; - description = lib.mdDoc '' - The path to log files to be rotated. - Spaces are allowed and normal shell quoting rules apply, - with ', ", and \ characters supported. - ''; - }; - - user = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - The user account to use for rotation. - ''; - }; - - group = mkOption { - type = with types; nullOr str; - default = null; - description = lib.mdDoc '' - The group to use for rotation. - ''; - }; - - frequency = mkOption { - type = types.enum [ "hourly" "daily" "weekly" "monthly" "yearly" ]; - default = "daily"; - description = lib.mdDoc '' - How often to rotate the logs. - ''; - }; - - keep = mkOption { - type = types.int; - default = 20; - description = lib.mdDoc '' - How many rotations to keep. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = lib.mdDoc '' - Extra logrotate config options for this path. Refer to - for details. - ''; - }; - - priority = mkOption { - type = types.int; - default = 1000; - description = lib.mdDoc '' - Order of this logrotate block in relation to the others. The semantics are - the same as with `lib.mkOrder`. Smaller values have a greater priority. - ''; - }; - }; - - config.name = name; - }; - generateLine = n: v: if builtins.elem n [ "files" "priority" "enable" "global" ] || v == null then null - else if builtins.elem n [ "extraConfig" "frequency" ] then "${v}\n" + else if builtins.elem n [ "frequency" ] then "${v}\n" else if builtins.elem n [ "firstaction" "lastaction" "prerotate" "postrotate" "preremove" ] then "${n}\n ${v}\n endscript\n" else if isInt v then "${n} ${toString v}\n" @@ -110,25 +26,6 @@ let ${generateSection 2 settings}} ''; - # below two mapPaths are compat functions - mapPathOptToSetting = n: v: - if n == "keep" then nameValuePair "rotate" v - else if n == "path" then nameValuePair "files" v - else nameValuePair n v; - - mapPathsToSettings = path: pathOpts: - nameValuePair path ( - filterAttrs (n: v: ! builtins.elem n [ "user" "group" "name" ] && v != "") ( - (mapAttrs' mapPathOptToSetting pathOpts) // - { - su = - if pathOpts.user != null - then "${pathOpts.user} ${pathOpts.group}" - else null; - } - ) - ); - settings = sortProperties (attrValues (filterAttrs (_: settings: settings.enable) ( foldAttrs recursiveUpdate { } [ { @@ -139,15 +36,7 @@ let frequency = "weekly"; rotate = 4; }; - # compat section - extraConfig = { - enable = (cfg.extraConfig != ""); - global = true; - extraConfig = cfg.extraConfig; - priority = 101; - }; } - (mapAttrs' mapPathsToSettings cfg.paths) cfg.settings { header = { global = true; priority = 100; }; } ] @@ -200,7 +89,9 @@ let in { imports = [ - (mkRenamedOptionModule [ "services" "logrotate" "config" ] [ "services" "logrotate" "extraConfig" ]) + (mkRemovedOptionModule [ "services" "logrotate" "config" ] "Modify services.logrotate.settings.header instead") + (mkRemovedOptionModule [ "services" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.header instead") + (mkRemovedOptionModule [ "services" "logrotate" "paths" ] "Add attributes to services.logrotate.settings instead") ]; options = { @@ -311,76 +202,10 @@ in in this case you can disable the failing check with this option. ''; }; - - # deprecated legacy compat settings - paths = mkOption { - type = with types; attrsOf (submodule pathOpts); - default = { }; - description = lib.mdDoc '' - Attribute set of paths to rotate. The order each block appears in the generated configuration file - can be controlled by the [priority](#opt-services.logrotate.paths._name_.priority) option - using the same semantics as `lib.mkOrder`. Smaller values have a greater priority. - This setting has been deprecated in favor of [logrotate settings](#opt-services.logrotate.settings). - ''; - example = literalExpression '' - { - httpd = { - path = "/var/log/httpd/*.log"; - user = config.services.httpd.user; - group = config.services.httpd.group; - keep = 7; - }; - - myapp = { - path = "/var/log/myapp/*.log"; - user = "myuser"; - group = "mygroup"; - frequency = "weekly"; - keep = 5; - priority = 1; - }; - } - ''; - }; - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = lib.mdDoc '' - Extra contents to append to the logrotate configuration file. Refer to - for details. - This setting has been deprecated in favor of - [logrotate settings](#opt-services.logrotate.settings). - ''; - }; }; }; config = mkIf cfg.enable { - assertions = - mapAttrsToList - (name: pathOpts: - { - assertion = (pathOpts.user != null) == (pathOpts.group != null); - message = '' - If either of `services.logrotate.paths.${name}.user` or `services.logrotate.paths.${name}.group` are specified then *both* must be specified. - ''; - }) - cfg.paths; - - warnings = - (mapAttrsToList - (name: pathOpts: '' - Using config.services.logrotate.paths.${name} is deprecated and will become unsupported in a future release. - Please use services.logrotate.settings instead. - '') - cfg.paths - ) ++ - (optional (cfg.extraConfig != "") '' - Using config.services.logrotate.extraConfig is deprecated and will become unsupported in a future release. - Please use services.logrotate.settings with globals=true instead. - ''); - systemd.services.logrotate = { description = "Logrotate Service"; startAt = "hourly"; diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 4988517a9b66..13453d9cc785 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -260,6 +260,7 @@ in { (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ]) (mkRenamedOptionModule [ "services" "gitlab" "backupPath" ] [ "services" "gitlab" "backup" "path" ]) (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ] "") + (mkRemovedOptionModule [ "services" "gitlab" "logrotate" "extraConfig" ] "Modify services.logrotate.settings.gitlab directly instead") ]; options = { @@ -871,15 +872,6 @@ in { default = 30; description = lib.mdDoc "How many rotations to keep."; }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = lib.mdDoc '' - Extra logrotate config options for this path. Refer to - for details. - ''; - }; }; workhorse.config = mkOption { @@ -1042,7 +1034,6 @@ in { rotate = cfg.logrotate.keep; copytruncate = true; compress = true; - extraConfig = cfg.logrotate.extraConfig; }; }; }; diff --git a/nixos/tests/logrotate.nix b/nixos/tests/logrotate.nix index b0685f3af9ff..94f6ad5103fb 100644 --- a/nixos/tests/logrotate.nix +++ b/nixos/tests/logrotate.nix @@ -64,29 +64,6 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { notifempty = true; }; }; - # extraConfig compatibility - should be added to top level, early. - services.logrotate.extraConfig = '' - nomail - ''; - # paths compatibility - services.logrotate.paths = { - compat_path = { - path = "compat_test_path"; - }; - # user/group should be grouped as 'su user group' - compat_user = { - user = config.users.users.root.name; - group = "root"; - }; - # extraConfig in path should be added to block - compat_extraConfig = { - extraConfig = "dateext"; - }; - # keep -> rotate - compat_keep = { - keep = 1; - }; - }; }; }; @@ -127,12 +104,6 @@ import ./make-test-python.nix ({ pkgs, ... }: rec { "sed -ne '/\"postrotate\" {/,/}/p' /tmp/logrotate.conf | grep endscript", "grep '\"file1\"\n\"file2\" {' /tmp/logrotate.conf", "sed -ne '/\"import\" {/,/}/p' /tmp/logrotate.conf | grep noolddir", - "sed -ne '1,/^\"/p' /tmp/logrotate.conf | grep nomail", - "grep '\"compat_test_path\" {' /tmp/logrotate.conf", - "sed -ne '/\"compat_user\" {/,/}/p' /tmp/logrotate.conf | grep 'su root root'", - "sed -ne '/\"compat_extraConfig\" {/,/}/p' /tmp/logrotate.conf | grep dateext", - "[[ $(sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w rotate) = \" rotate 1\" ]]", - "! sed -ne '/\"compat_keep\" {/,/}/p' /tmp/logrotate.conf | grep -w keep", ) # also check configFile option failingMachine.succeed( From 665d896244a1e3bc3cac7b9de1b1f1b6ce3096d8 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Mon, 13 Jun 2022 07:36:08 +0900 Subject: [PATCH 098/223] logrotate: add services.logrotate.settings example --- nixos/modules/services/logging/logrotate.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index b597ff9f5299..fd41b982678f 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -109,6 +109,25 @@ in or settings common to all further files settings. Refer to for details. ''; + example = literalExpression '' + { + # global options + header = { + dateext = true; + }; + # example custom files + "/var/log/mylog.log" = { + frequency = "daily"; + rotate = 3; + }; + "multiple paths" = { + files = [ + "/var/log/first*.log" + "/var/log/second.log" + ]; + }; + }; + ''; type = types.attrsOf (types.submodule ({ name, ... }: { freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ])); From fb445b517ea4b379c822723b484847e01fd5bf6c Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 4 Nov 2022 15:08:33 +0800 Subject: [PATCH 099/223] nixos/fish: use a local version of runCommand for babelfishTranslate Building etc."fish/setEnvironment.fish" needs config.system.build.setEnvironment, which can be very large. And what babelfishTranslate does is to translate env vars exported by bash syntax, which does not need much computing power. This patch can reduce the network traffic when using remote builders with almost no harm. --- nixos/modules/programs/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 357105c3e79b..160adc0cad6d 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -35,7 +35,7 @@ let ''; babelfishTranslate = path: name: - pkgs.runCommand "${name}.fish" { + pkgs.runCommandLocal "${name}.fish" { nativeBuildInputs = [ pkgs.babelfish ]; } "${pkgs.babelfish}/bin/babelfish < ${path} > $out;"; From 5eaab876db34a60b79822b935a4e561bc6330eff Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 4 Nov 2022 22:18:58 -0400 Subject: [PATCH 100/223] cargo-deny: 0.13.3 -> 0.13.4 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 92fea8377424..869c5efaf643 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-INRQy7udhrc21Hy5HQ83LAoc2sjUE5AU5uf7mHJPkpo="; + sha256 = "sha256-GmuBWvDy4UfEvR3znj8BQiIHzu5KSY4rgOc+I/GGJZU="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-JRciz40mSAXy3SoXVegudK4ehRjTBvSqrSFRDt7O/uQ="; + cargoSha256 = "sha256-Mm/IzEAOSDbO9c+C12Y6BNHlxKVVM+gOK1mGLtaJO2A="; nativeBuildInputs = [ pkg-config ]; From 0b894f5564ab21bcff4454d2358fc04eda7e1492 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:35:27 +0100 Subject: [PATCH 101/223] kicad: migrate to wxGTK32 --- .../science/electronics/kicad/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 9042862eac32..1540e3bdb696 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , gnome , dconf -, wxGTK31 +, wxGTK32 , gtk3 , makeWrapper , gsettings-desktop-schemas @@ -104,9 +104,9 @@ let if srcOverridep "libVersion" then srcs.libVersion else versionsImport.${baseName}.libVersion.version; - wxGTK = wxGTK31; + wxGTK = wxGTK32; python = python3; - wxPython = python.pkgs.wxPython_4_1; + wxPython = python.pkgs.wxPython_4_2; inherit (lib) concatStringsSep flatten optionalString optionals; in @@ -224,11 +224,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ evils kiwi ]; # kicad is cross platform platforms = lib.platforms.all; - # despite that, nipkgs' wxGTK for darwin is "wxmac" - # and wxPython_4_0 does not account for this - # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), - # seems like more trouble than fixing wxPython_4_0 would be - # additionally, libngspice is marked as linux only, though it should support darwin hydraPlatforms = if (with3d) then [ ] else platforms; # We can't download the 3d models on Hydra, From ad5d00e65c38ba036a74f2b8a758dbfb4eec2348 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 5 Nov 2022 10:35:39 +0800 Subject: [PATCH 102/223] pantheon.elementary-files: 6.1.4 -> 6.2.0 --- .../pantheon/apps/elementary-files/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 9817962920a1..e34f0b901daf 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -29,24 +28,15 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.4"; + version = "6.2.0"; outputs = [ "out" "dev" ]; - patches = [ - # Fix terminal critical warnings and possible crash when removing bookmark - # https://github.com/elementary/files/pull/2062 - (fetchpatch { - url = "https://github.com/elementary/files/commit/daa5ab244b45aafdd7be49eb0bd6f052ded5b5a7.patch"; - sha256 = "sha256-crGvbo9Ye9656cOy6YqNreMLE2pEMO0Rg8oz81OfJkw="; - }) - ]; - src = fetchFromGitHub { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-3j0b+hExUe6OBmEHQVmd2uBkbOGxMdpgDmymuCiph80="; + sha256 = "sha256-V1otkc1Og7J/A68j+4MrJzOtAH6PHSfj5fSpjKhhwo4="; }; nativeBuildInputs = [ From 7cd0ea9d379f5b4ed164b86401bad71312099b92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 02:47:55 +0000 Subject: [PATCH 103/223] syft: 0.60.2 -> 0.60.3 --- pkgs/tools/admin/syft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index 88923ef8dfbe..c221ea38eaea 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.60.2"; + version = "0.60.3"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qOsKpJwX+8wFvVt/vLdVJ47rfoOn+11phq4HsQVLV6M="; + sha256 = "sha256-btPH92cLCAZFzlVoRxivBBhqzDK1bASrKbk3jvwDNo8="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 177eaa168a88d324ab2da43eb1855beacace9372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 02:55:17 +0000 Subject: [PATCH 104/223] terragrunt: 0.39.2 -> 0.40.0 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 10649ffb9ffd..f2cafe7f1d9a 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.39.2"; + version = "0.40.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YHPtOcWhUDcCqtAmxy/veBgpYY+UmnmK2IwplI5uRh0="; + sha256 = "sha256-ZDoGlm/H2xh9+azb7N1EWUXwfF919K9B4PmQZol4RV8="; }; vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg="; From 0134117916a433f9f3cb1daf14f84836b3138765 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Fri, 4 Nov 2022 23:00:01 -0400 Subject: [PATCH 105/223] =?UTF-8?q?python3Packages.pygls:=200.12.1=20?= =?UTF-8?q?=E2=86=92=200.12.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pygls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/default.nix index e9a6850b5e65..ce69c36d7461 100644 --- a/pkgs/development/python-modules/pygls/default.nix +++ b/pkgs/development/python-modules/pygls/default.nix @@ -13,16 +13,16 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.12.1"; + version = "0.12.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "openlawlibrary"; - repo = pname; + repo = "pygls"; rev = "refs/tags/v${version}"; - sha256 = "sha256-L2KTNiI+I+r2fF88B1NSunowokrDzGCw3PXbxekg/oE="; + sha256 = "sha256-RtoRIfPIbERQFx0GzQqsxnKAMsIK5Zbf2sNtHhC2fmo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b090a8c2517c7ee479f2e2a821bae6ec26f0f812 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 5 Nov 2022 03:24:21 +0000 Subject: [PATCH 106/223] wallutils: 5.11.1 -> 5.12.4 --- pkgs/tools/graphics/wallutils/default.nix | 43 +++++++++++++++++------ 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/graphics/wallutils/default.nix b/pkgs/tools/graphics/wallutils/default.nix index 8ab6bba1ef12..67c325eb26af 100644 --- a/pkgs/tools/graphics/wallutils/default.nix +++ b/pkgs/tools/graphics/wallutils/default.nix @@ -1,35 +1,56 @@ -{ buildGoPackage, fetchFromGitHub, lib +{ lib +, buildGoModule +, fetchFromGitHub , pkg-config -, wayland, libX11, xbitmaps, libXcursor, libXmu, libXpm, libheif +, wayland +, libX11 +, xbitmaps +, libXcursor +, libXmu +, libXpm +, libheif }: -buildGoPackage rec { +buildGoModule rec { pname = "wallutils"; - version = "5.11.1"; + version = "5.12.4"; src = fetchFromGitHub { owner = "xyproto"; repo = "wallutils"; rev = version; - sha256 = "sha256-FL66HALXsf7shoUKIZp6HORyuxhOfgTrY+PQAe92yk8="; + sha256 = "sha256-NODG4Lw/7X1aoT+dDSWxWEbDX6EAQzzDJPwsWOLaJEM="; }; - goPackagePath = "github.com/xyproto/wallutils"; + vendorSha256 = null; patches = [ ./lscollection-Add-NixOS-paths-to-DefaultWallpaperDirectories.patch ]; - postPatch = '' - # VersionString is sometimes not up-to-date: - sed -iE 's/VersionString = "[0-9].[0-9].[0-9]"/VersionString = "${version}"/' wallutils.go - ''; + excludedPackages = [ + "./pkg/event/cmd" # Development tools + ]; + + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ wayland libX11 xbitmaps libXcursor libXmu libXpm libheif ]; + preCheck = + let skippedTests = [ + "TestClosest" # Requiring Wayland or X. + "TestNewSimpleEvent" # Blocking + "TestEveryMinute" # Blocking + ]; in + '' + export XDG_RUNTIME_DIR=`mktemp -d` + + buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") + ''; + meta = with lib; { description = "Utilities for handling monitors, resolutions, and (timed) wallpapers"; inherit (src.meta) homepage; - license = licenses.mit; + license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; }; From cdd3dda63b198675a4c5ed186a15b8fbd35d19a9 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 5 Nov 2022 03:35:15 +0000 Subject: [PATCH 107/223] cni: 0.8.1 -> 1.1.2 --- .../networking/cluster/cni/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 3a9bb84938ca..3dcf284021ed 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,17 +1,23 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "cni"; - version = "0.8.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vxwNHIc3rFi7HKIEZrBcr7Oxs2iUtFYcfJK7aXDUv3k="; + sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg="; }; - goPackagePath = "github.com/containernetworking/cni"; + vendorSha256 = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; + + subPackages = [ + "./cnitool" + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Container Network Interface - networking for Linux containers"; From c4937f84a54a24323376d770c80326c203c3e72f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Oct 2022 14:52:38 +0000 Subject: [PATCH 108/223] cloud-init: 22.3.3 -> 22.3.4 --- pkgs/tools/virtualization/cloud-init/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 6a2d0fcdda70..5e438d887211 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -14,14 +14,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "22.3.3"; + version = "22.3.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; - rev = version; - hash = "sha256-9vdFPSmkkdJDlVfA9DgqczRoOBMmSMezdl3D/0OSbsQ="; + rev = "refs/tags/${version}"; + hash = "sha256-agffkTEaURjw/Ro8znYRQLKhDP2Ey0LimuzqbW5xb28="; }; patches = [ ./0001-add-nixos-support.patch ]; From d163332ff9bd18c4ae27936990bcfae8210bfb26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 18:34:57 +0000 Subject: [PATCH 109/223] jellyfin-ffmpeg: 5.1.2-2 -> 5.1.2-4 --- pkgs/development/libraries/jellyfin-ffmpeg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 6beceec390a8..ccff068e1da2 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,13 +8,13 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1.2-2"; + version = "5.1.2-4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-7Icp1vFnvhuohipGK7BqnxhhtX0iB02v5TXvh5sss3c="; + sha256 = "sha256-yzaS50sPgyRRLnvzaOiKOEaHKL3Yuf89KsHyPebjoL8="; }; configureFlags = old.configureFlags ++ [ From 23909915446bbdf3104e6300c228486ace7548ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Oct 2022 21:48:17 +0000 Subject: [PATCH 110/223] s3cmd: 2.2.0 -> 2.3.0 --- pkgs/tools/networking/s3cmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index a73d39b5126a..db6175bea50a 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "s3cmd"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; - rev = "v${version}"; - sha256 = "0w4abif05mp52qybh4hjg6jbbj2caljq5xdhfiha3g0s5zsq46ri"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nb4WEH8ELaG/bIe4NtjD4p99VJoG90UQ662iWyvnr2U="; }; propagatedBuildInputs = [ python-magic python-dateutil ]; From 0912afd6efd0f7acc0855dbefe94b0eac3c016f9 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Sat, 5 Nov 2022 02:48:19 +0000 Subject: [PATCH 111/223] =?UTF-8?q?texlab:=204.3.0=20=E2=86=92=204.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/texlab/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index cd57796b0bc3..017d82c4e661 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -14,16 +14,16 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PhzxWLkqsHU32vIZwHzdy86bwIzDDmnxp12PS774P3k="; + sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU="; }; - cargoSha256 = "sha256-tH566L0oHnI9mNp1KtJYaBaWCkiAOrtBYkfVSCA2N6w="; + cargoSha256 = "sha256-nu2KltPgexBTxG13kUgHgMrxefPD+Gaj5qBIWWFPdFs="; outputs = [ "out" ] ++ lib.optional (!isCross) "man"; @@ -36,19 +36,11 @@ in rustPlatform.buildRustPackage rec { CoreServices ]; - postInstall = '' - # Remove generated dylib of human_name dependency. TexLab statically - # links to the generated rlib and doesn't reference the dylib. I - # couldn't find any way to prevent building this by passing cargo flags. - # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 - rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" - rmdir "$out/lib" - '' # When we cross compile we cannot run the output executable to # generate the man page - + lib.optionalString (!isCross) '' + postInstall = lib.optionalString (!isCross) '' # TexLab builds man page separately in CI: - # https://github.com/latex-lsp/texlab/blob/v4.3.0/.github/workflows/publish.yml#L131-L135 + # https://github.com/latex-lsp/texlab/blob/v4.3.1/.github/workflows/publish.yml#L126-L130 help2man --no-info "$out/bin/texlab" > texlab.1 installManPage texlab.1 ''; From 9f07f3bc7e382eda7dcc1366c0aa88a08e44b976 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Mon, 12 Sep 2022 13:10:59 -0400 Subject: [PATCH 112/223] texlab: format with nixpkgs-fmt --- pkgs/development/tools/misc/texlab/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 017d82c4e661..d33ac023fcd3 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -12,13 +12,14 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; -in rustPlatform.buildRustPackage rec { +in +rustPlatform.buildRustPackage rec { pname = "texlab"; version = "4.3.1"; src = fetchFromGitHub { owner = "latex-lsp"; - repo = pname; + repo = "texlab"; rev = "refs/tags/v${version}"; sha256 = "sha256-gtPnuKmKfUBZDM6DATJB5NxndOwvG5JpBRO4cEU6lIU="; }; @@ -28,7 +29,7 @@ in rustPlatform.buildRustPackage rec { outputs = [ "out" ] ++ lib.optional (!isCross) "man"; nativeBuildInputs = [ installShellFiles ] - ++ lib.optional (!isCross) help2man; + ++ lib.optional (!isCross) help2man; buildInputs = lib.optionals stdenv.isDarwin [ libiconv From 6c731843c3bb81cdfa15b65302f2c7a4e0c3af08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Oct 2022 03:11:10 +0000 Subject: [PATCH 113/223] pgloader: 3.6.8 -> 3.6.9 --- pkgs/development/tools/pgloader/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pgloader/default.nix b/pkgs/development/tools/pgloader/default.nix index c86c3eb08708..f12cf2a07c96 100644 --- a/pkgs/development/tools/pgloader/default.nix +++ b/pkgs/development/tools/pgloader/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.8/pgloader-bundle-3.6.8.tgz"; - sha256 = "sha256-h5vB+KOapbXsSVNIVWEsaanyczaCfl81+SXdiNmNboE="; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.9/pgloader-bundle-3.6.9.tgz"; + sha256 = "sha256-pdCcRmoJnrfVnkhbT0WqLrRbCtOEmRgGRsXK+3uByeA="; }; nativeBuildInputs = [ git makeWrapper ]; From c8abf9c3762dfbcd66c9e40acb857168ecd56c1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Oct 2022 09:42:28 +0000 Subject: [PATCH 114/223] debootstrap: 1.0.127 -> 1.0.128 --- pkgs/tools/misc/debootstrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index b8d099795e0e..9465d412b046 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -16,14 +16,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.127"; + version = "1.0.128"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "sha256-KKH9F0e4HEO2FFh1/V5UIY5C95ZOUm4nUhVUGqpZWaI="; + sha256 = "sha256-WybWWyRPreokjUAdWfZ2MUjgZhF1GTncpbLajQ3rh0E="; }; nativeBuildInputs = [ makeWrapper ]; From 44770699eaa5f320c85a96d3dc534aba365f16c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 15:31:50 +0000 Subject: [PATCH 115/223] netbird: 0.10.3 -> 0.10.4 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index f4195dfa5fd9..5811c9a4a268 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JytK4wmQepSSml6jmP2TWRICt/s26E56ntACpFdiTDU="; + sha256 = "sha256-Z67imUrs/NUoBfbqIBmfTNMb1+X1NpYX4KxB5jU4C9c="; }; vendorSha256 = "sha256-3gpA0EGdcVeUCU7iozpjQJM/iid34PRm3gpxUiwzDEk="; From 71d53b94c6b187bc99fe8e03cc7fdfc8ff6878ab Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 Nov 2022 04:20:00 +0000 Subject: [PATCH 116/223] oh-my-posh: 12.11.0 -> 12.12.1 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index 3cf2de28112e..8829a3e1583f 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "12.11.0"; + version = "12.12.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mvjuUABnK3l4BNrDicvUnYgf4ur8ZE15f/AqUlylcM8="; + sha256 = "sha256-6h/TV9Ddv+1pYPV7ZvOfEOOvbocRpLXdeR6EchTvV/A="; }; vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU="; From 8e97d7003e8e9b102be12cb760f9538eab2b58f9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 Nov 2022 04:20:00 +0000 Subject: [PATCH 117/223] nixpacks: 0.12.1 -> 0.12.2 https://github.com/railwayapp/nixpacks/releases/tag/v0.12.2 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index b913caa3b037..497ba195e897 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WSUkWb300D/FFsDBj8b+xrxQeQVxf265UU5PChV5Qhk="; + sha256 = "sha256-l6QIP/GIm7QMWLjYQJ3yuT7mWriowcND32EUuiNfvNA="; }; - cargoSha256 = "sha256-ba06rs7OEBKQQ4VtwzXLcgGK8DLqu6ctQvOoQhAtwlc="; + cargoSha256 = "sha256-t2kxpiSSYzg4MfjCyxkKNfPLTwGB8KgzQonFkLPCpvM="; # skip test due FHS dependency doCheck = false; From d59b9ca501d0cf436391c1470dfd8788a0491bc8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 Nov 2022 04:20:00 +0000 Subject: [PATCH 118/223] python310Packages.pdfminer: 20220524 -> 20221105 https://github.com/pdfminer/pdfminer.six/releases/tag/20221105 --- .../python-modules/pdfminer-six/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer-six/default.nix b/pkgs/development/python-modules/pdfminer-six/default.nix index 3911794b89cb..ec434b3dfbe6 100644 --- a/pkgs/development/python-modules/pdfminer-six/default.nix +++ b/pkgs/development/python-modules/pdfminer-six/default.nix @@ -4,13 +4,16 @@ , isPy3k , cryptography , charset-normalizer +, pythonOlder +, typing-extensions , pytestCheckHook , ocrmypdf }: buildPythonPackage rec { pname = "pdfminer-six"; - version = "20220524"; + version = "20221105"; + format = "setuptools"; disabled = !isPy3k; @@ -18,10 +21,13 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-XO9sdHeS/8MgVW0mxbTe2AY5BDfnBSDNzZwLsSKmQh0="; + sha256 = "sha256-OyEeQBuYfj4iEcRt2/daSaUfTOjCVSCyHW2qffal+Bk="; }; - propagatedBuildInputs = [ charset-normalizer cryptography ]; + propagatedBuildInputs = [ + charset-normalizer + cryptography + ] ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; postInstall = '' for file in $out/bin/*.py; do @@ -30,14 +36,19 @@ buildPythonPackage rec { ''; postPatch = '' - # Verion is not stored in repo, gets added by a GitHub action after tag is created + # Version is not stored in repo, gets added by a GitHub action after tag is created # https://github.com/pdfminer/pdfminer.six/pull/727 substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} ''; - pythonImportsCheck = [ "pdfminer" ]; + pythonImportsCheck = [ + "pdfminer" + "pdfminer.high_level" + ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; passthru = { tests = { From f9dc9130110d72e9c74b3d6625758796eaafee4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 04:15:42 +0000 Subject: [PATCH 119/223] v2ray-geoip: 202210270100 -> 202211030059 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 0d2c4588ede9..b6b4af002d5c 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202210270100"; + version = "202211030059"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "7558586fefca29c5d1705777187677fd8a4c4e6f"; - sha256 = "sha256-8UKcmkaRe51X4JgQ5pqPE46BnVF0AlXETD/Pliwx9xk="; + rev = "b7d16c8aea9bbe2555fe4aabddd1fb86f9785229"; + sha256 = "sha256-1WxqD9a0uJY+/DiFwESkEceN2EJvDl5qhLg4oEs5uSA="; }; installPhase = '' From a9fb9f3b062e28b5c0d98b3187bce32d925273bc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 5 Nov 2022 13:10:51 +0800 Subject: [PATCH 120/223] Revert "sysdig: pin to openssl_1_1" This reverts commit 240ace010db8979fed8c0246fe978497b4404484. --- pkgs/top-level/all-packages.nix | 1 - pkgs/top-level/linux-kernels.nix | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11591c09582c..9456fdfe6487 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25683,7 +25683,6 @@ with pkgs; swiftdefaultapps = callPackage ../os-specific/darwin/swiftdefaultapps { }; sysdig = callPackage ../os-specific/linux/sysdig { - openssl = openssl_1_1; kernel = null; }; # sysdig is a client, for a driver look at linuxPackagesFor diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 809858799658..efd71e23ce74 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -442,9 +442,7 @@ in { rr-zen_workaround = callPackage ../development/tools/analysis/rr/zen_workaround.nix { }; - sysdig = callPackage ../os-specific/linux/sysdig { - openssl = pkgs.openssl_1_1; - }; + sysdig = callPackage ../os-specific/linux/sysdig {}; systemtap = callPackage ../development/tools/profiling/systemtap { }; From 321be9630bc59cfc274a4ec648093e31f7ad0543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 06:10:34 +0000 Subject: [PATCH 121/223] waypoint: 0.10.2 -> 0.10.3 --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 7649cc5b7dfe..317c0d5374bc 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4RAnGPzXrPXMclDiTd38VrOy7zqvccD/xrm3QpeFubM="; + sha256 = "sha256-+lNeMcSlhmbs1knONnoX2RhEgxTYyCfpdD6WuDTiLx8="; }; - vendorSha256 = "sha256-fBsRmUE72lot9Ju/hUqpdSSXvMktRGP+H4WQ0GOCxrY="; + vendorSha256 = "sha256-59rJ30m6eiNIapJUNc1jRJE7IoAj0O+5G8JyKkhcyvY="; nativeBuildInputs = [ go-bindata installShellFiles ]; From ea85340ba702e093965b6ba9863d885e751457f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:32:06 +0000 Subject: [PATCH 122/223] =?UTF-8?q?terraform-providers.skytap:=200.15.0=20?= =?UTF-8?q?=E2=86=92=200.15.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dd8b93a56528..019eaea28118 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1058,13 +1058,13 @@ "version": "6.18.0" }, "skytap": { - "hash": "sha256-EAimiuQJOt12baZSjDKI+c9UjJd8e26ouOAZIZezw/I=", + "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", "owner": "skytap", "provider-source-address": "registry.terraform.io/skytap/skytap", "repo": "terraform-provider-skytap", - "rev": "v0.15.0", + "rev": "v0.15.1", "vendorHash": null, - "version": "0.15.0" + "version": "0.15.1" }, "snowflake": { "hash": "sha256-XjLsRS7n3p0lNVEPx6b+h5TCzK+1Kws/72FNgy3sVbE=", From 9389dec4a78b4d33d97f2423c406a7867482d42a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:32:52 +0000 Subject: [PATCH 123/223] =?UTF-8?q?terraform-providers.snowflake:=200.49.0?= =?UTF-8?q?=20=E2=86=92=200.50.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 019eaea28118..8bc954f1cc0d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1067,13 +1067,13 @@ "version": "0.15.1" }, "snowflake": { - "hash": "sha256-XjLsRS7n3p0lNVEPx6b+h5TCzK+1Kws/72FNgy3sVbE=", + "hash": "sha256-Hoaqj3hksiWm60cSr8OPqAvS29SMVLtwkSWXZvpBePA=", "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.49.0", + "rev": "v0.50.0", "vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=", - "version": "0.49.0" + "version": "0.50.0" }, "sops": { "hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=", From 0bf54c5ee77086c4fb33a973ca2babb5fcde9833 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:34:18 +0000 Subject: [PATCH 124/223] =?UTF-8?q?terraform-providers.sumologic:=202.19.1?= =?UTF-8?q?=20=E2=86=92=202.19.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8bc954f1cc0d..d2e2ec78f708 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1112,13 +1112,13 @@ "version": "2.0.5" }, "sumologic": { - "hash": "sha256-DvEd1OdLmUEEmk0zl7jiTjdk/3Fp1Z/3KCpYRpxHTn4=", + "hash": "sha256-lhMPA4ub3NlaYs0pX6FkWuR3LQxytrQxu9DjAjDja2Q=", "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.19.1", + "rev": "v2.19.2", "vendorHash": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=", - "version": "2.19.1" + "version": "2.19.2" }, "tailscale": { "hash": "sha256-/qC8TOtoVoBTWeAFpt2TYE8tlYBCCcn/mzVQ/DN51YQ=", From 429feeb354f4fbe587f857ebca60a5945df0e4cd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 5 Nov 2022 03:36:07 +0000 Subject: [PATCH 125/223] =?UTF-8?q?terraform-providers.tencentcloud:=201.7?= =?UTF-8?q?8.7=20=E2=86=92=201.78.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d2e2ec78f708..04a711142b15 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1130,13 +1130,13 @@ "version": "0.13.5" }, "tencentcloud": { - "hash": "sha256-lWePRU8kmOjOq9giCMdU5Aeb74WR/s6wIzShjzDBFjc=", + "hash": "sha256-DvH8+Be2AVwsNoDrNlCG8/Uve2EKcuan3qUsJynreHw=", "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.78.7", + "rev": "v1.78.8", "vendorHash": null, - "version": "1.78.7" + "version": "1.78.8" }, "tfe": { "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", From 4ab518fd62ee276dbbd636d65b82ab7f09c1aa83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 06:45:31 +0000 Subject: [PATCH 126/223] python310Packages.mpi4py: 3.1.3 -> 3.1.4 --- pkgs/development/python-modules/mpi4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index aa5a74c2cfe8..8ea726de8525 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.1.3"; + version = "3.1.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8en64QefQ+r92fgXzbP9MNcJ7cCTtdXa2lekYbLbMAg="; + sha256 = "sha256-F4WPLrxiMiDQEg0fqNQo0DPd50nEvDWzPYGmatf5NIA="; }; passthru = { From 44757a1a48bcb22b76409d4f9397661b515d991e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 5 Nov 2022 07:00:41 +0000 Subject: [PATCH 127/223] sudo: 1.9.12 -> 1.9.12p1 --- pkgs/tools/security/sudo/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index aa032467f482..eb55297f643b 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , buildPackages , coreutils , pam @@ -15,21 +14,13 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.12"; + version = "1.9.12p1"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-3hVzOIgXDFaDTar9NL+YPbEPshA5dC/Pw5a9MhaNY2I="; + hash = "sha256-R1oYqOs9qLKRfOqwY6a69R6gkSjDxH4+DjOrdJe6t9g="; }; - patches = [ - (fetchpatch { - name = "CVE-2022-43995.patch"; - url = "https://github.com/sudo-project/sudo/commit/bd209b9f16fcd1270c13db27ae3329c677d48050.patch"; - sha256 = "sha256-JUdoStoSyv6KBPsyzxuMIxqwZMZsjUPj8zUqOSvmZ1A="; - }) - ]; - prePatch = '' # do not set sticky bit in nix store substituteInPlace src/Makefile.in --replace 04755 0755 From 2660e014748ed5e8aa98b468ce0f623d58afe1de Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 5 Nov 2022 03:26:12 -0400 Subject: [PATCH 128/223] laminar: pass version to the build system Without this patch, laminar identifies itself as xx-unversioned both in command line interface (laminarc --help) and in web interface. --- .../tools/continuous-integration/laminar/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix index fc0a77cdb66a..f84729783110 100644 --- a/pkgs/development/tools/continuous-integration/laminar/default.nix +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -38,6 +38,8 @@ in stdenv.mkDerivation rec { # We need both binary from "capnproto" and library files. nativeBuildInputs = [ cmake pandoc capnproto ]; buildInputs = [ capnproto sqlite boost zlib rapidjson ]; + cmakeFlags = [ "-DLAMINAR_VERSION=${version}" ]; + preBuild = '' mkdir -p js css cp ${js.vue} js/vue.min.js From ee33796d9af212f2b4b8049ccb451d4d2296fec4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 06:01:01 +0000 Subject: [PATCH 129/223] vscodium: 1.72.2.22289 -> 1.73.0.22306 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 74c28ad41b2b..0ce6b8f99468 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0bc95mdl19la63yvqrpfcvq9sx68wfv60a3xrz2z5lk308khfpr6"; - x86_64-darwin = "0qb8610ilf69j0zl7z031bmqdsxsj15w1maz7lx0z09yrdyvgi7c"; - aarch64-linux = "157arn7wsxgh3qr4bzhy75y7zw9qwz1zch7ny36kr53135d2nhz6"; - aarch64-darwin = "0dwzqv1j1gcjyc1w41f9k1pijazr62r569arh4l53xi7amrp7hx8"; - armv7l-linux = "1lam1z8hqdav4al07d1ahq4qh2npv191n2gqpdxg5b1fs7zv3k85"; + x86_64-linux = "1jp21lnz3vmv4f6crnqbkj6jzr6wl5h2ibniki7azamaqxy51ipi"; + x86_64-darwin = "1msngvngcfhc3zmi2vfg5bgrhmj9ml4pyd9lpr7dpcxycswvifw7"; + aarch64-linux = "17l4w4vvvninyhyiwkkqhz7nhm68wj7diwwn9sh54x71dmwcqlcs"; + aarch64-darwin = "102vciba35sma1810bvnr5xa9qaf0fbvrg8blqchy77gydcrnj8b"; + armv7l-linux = "0ihbqy5wda1326nhqgckz26icr9inwk1pvspvpmg221y279s3iwp"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.72.2.22289"; + version = "1.73.0.22306"; pname = "vscodium"; executableName = "codium"; From 5e6f87576bd21c70b364ec78a03850962b0b3924 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 5 Nov 2022 07:57:50 +0100 Subject: [PATCH 130/223] linux_xanmod_latest: 6.0.6 -> 6.0.7 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 2ac516175f02..290b82202daa 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.0.6"; - hash = "sha256-JMfAtiPDgoVF+ypeFXev06PL39ZM2H7m07IxpasjAoM="; + version = "6.0.7"; + hash = "sha256-qeM2oswuop42rvyBGlrH6VvODScLCpAOjTc4KR5a2Ec="; variant = "main"; }; From 3bf7a9438919346b47ad7205c076b36d1517e26a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 06:04:22 +0000 Subject: [PATCH 131/223] wasmedge: 0.11.1 -> 0.11.2 --- pkgs/development/tools/wasmedge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 146b67f0a317..58b4b89ad9aa 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -9,13 +9,13 @@ llvmPackages.stdenv.mkDerivation rec { pname = "wasmedge"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = version; - sha256 = "sha256-+rCzbw44/8mHo6v4rUuXOq4FVs/LJtSF5zhva9/LIL0="; + sha256 = "sha256-P2Y2WK6G8aEK1Q4hjrS9X+2WbOfy4brclB/+SWP5LTM="; }; buildInputs = [ From 3c18086d7e954fb5c7fcd69a67fa37e668cce729 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 00:49:08 +0000 Subject: [PATCH 132/223] bitwig-studio: 4.4.1 -> 4.4.2 --- pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 00843ec86323..038a5277d2f5 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-+NvQ7TA8WLnZKbzsB+jLl/CIg7tayKd+W2svtXtDsT4="; + sha256 = "sha256-nLXpf0Xi7yuz/Rm8Sfkr1PGLuazN+Lh6sIqkWFBmP3w="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; From 3ddb7c1a19f6aff296785ca6924e0b596b1f6254 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 17:02:21 +0000 Subject: [PATCH 133/223] micropad: 4.1.0 -> 4.2.0 --- pkgs/applications/office/micropad/default.nix | 6 +- .../applications/office/micropad/package.json | 4 +- pkgs/applications/office/micropad/yarn.lock | 447 ++++------------- pkgs/applications/office/micropad/yarn.nix | 456 ++++-------------- 4 files changed, 200 insertions(+), 713 deletions(-) diff --git a/pkgs/applications/office/micropad/default.nix b/pkgs/applications/office/micropad/default.nix index 8533e1e3455e..184157d9d011 100644 --- a/pkgs/applications/office/micropad/default.nix +++ b/pkgs/applications/office/micropad/default.nix @@ -14,18 +14,18 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - sha256 = "sha256-ity5oU6TCBpQgimoiaMswOV3FY7Z0GmBcFWqQzdYmao="; + sha256 = "sha256-XylyQd4AhvrwJzBZXab7rA2IrZcqzEv8BANk+ozYyHk="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - sha256 = "0br8lsdrbjkr5gl434r5ngdhbwbzhav94q8kizsixb8k0wwyfxy5"; + sha256 = "0vddz95c1khalvl2a9zccy36j8s7862gpqcqlrvp1pn4bbp2pm3s"; }; packageJSON = ./package.json; diff --git a/pkgs/applications/office/micropad/package.json b/pkgs/applications/office/micropad/package.json index 8eaa6e26f9b1..167cef8113be 100644 --- a/pkgs/applications/office/micropad/package.json +++ b/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.1.0", + "version": "4.2.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -26,7 +26,7 @@ "homepage": "https://getmicropad.com", "devDependencies": { "@types/node": "^18.7.18", - "electron": "^20.1.4", + "electron": "^21.2.2", "electron-builder": "^23.3.3", "typescript": "~4.8.3" }, diff --git a/pkgs/applications/office/micropad/yarn.lock b/pkgs/applications/office/micropad/yarn.lock index b033937987c1..93e7ea873667 100644 --- a/pkgs/applications/office/micropad/yarn.lock +++ b/pkgs/applications/office/micropad/yarn.lock @@ -111,14 +111,14 @@ integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== "@types/node@*", "@types/node@^18.7.18": - version "18.7.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154" - integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg== + version "18.11.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4" + integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg== "@types/node@^16.11.26": - version "16.11.59" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6" - integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw== + version "16.18.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc" + integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg== "@types/plist@^3.0.1": version "3.0.2" @@ -139,9 +139,9 @@ integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== "@types/yargs@^17.0.1": - version "17.0.12" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz#0745ff3e4872b4ace98616d4b7e37ccbd75f9526" - integrity sha512-Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ== + version "17.0.13" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" + integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== dependencies: "@types/yargs-parser" "*" @@ -174,13 +174,6 @@ ajv@^6.10.0, ajv@^6.12.0: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" @@ -198,10 +191,10 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz#78b9dbb0bd8a69842461edd77a3226d0547c5939" - integrity sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" @@ -209,13 +202,13 @@ app-builder-lib@23.3.3: "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.7" electron-osx-sign "^0.6.0" - electron-publish "23.3.3" + electron-publish "23.6.0" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -304,20 +297,6 @@ boolean@^3.0.1: resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -374,25 +353,25 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz#6c62c493ba2b73c2af92432db4013b5a327f02b2" - integrity sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz#449ee57ec1ffc7e59f7a3a8a1a33d25cf5e39e43" - integrity sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: "7zip-bin" "~5.1.1" "@types/debug" "^4.1.6" "@types/fs-extra" "^9.0.11" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.0.3" + builder-util-runtime "9.1.1" chalk "^4.1.1" cross-spawn "^7.0.3" debug "^4.3.4" @@ -418,12 +397,7 @@ cacheable-request@^6.0.0: normalize-url "^4.1.0" responselike "^1.0.2" -camelcase@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" - integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== - -chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.2, chalk@^4.1.1: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -441,20 +415,10 @@ chromium-pickle-js@^0.2.0: resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== -ci-info@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== - ci-info@^3.2.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz#b28484fd436cbc267900364f096c9dc185efb251" - integrity sha512-t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug== - -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" + integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== cli-truncate@^2.1.0: version "2.1.0" @@ -464,13 +428,13 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== dependencies: string-width "^4.2.0" - strip-ansi "^6.0.0" + strip-ansi "^6.0.1" wrap-ansi "^7.0.0" clone-response@^1.0.2: @@ -534,18 +498,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -567,11 +519,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: version "4.3.4" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" @@ -593,11 +540,6 @@ decompress-response@^3.3.0: dependencies: mimic-response "^1.0.0" -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - defer-to-connect@^1.0.1: version "1.1.3" resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" @@ -641,14 +583,14 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz#b37547f8403c3e9f7c60265a93d902f5b0c395ea" - integrity sha512-ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" fs-extra "^10.0.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -669,13 +611,6 @@ dmg-license@^1.0.11: smart-buffer "^4.0.2" verror "^1.10.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" @@ -699,36 +634,36 @@ ejs@^3.1.7: jake "^10.8.5" electron-builder@^23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz#88d4e584a99b9e36ca4e8432b1163a1ef877355f" - integrity sha512-mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw== + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: "@types/yargs" "^17.0.1" - app-builder-lib "23.3.3" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" - dmg-builder "23.3.3" + dmg-builder "23.6.0" fs-extra "^10.0.0" is-ci "^3.0.0" lazy-val "^1.0.5" read-config-file "6.2.0" - update-notifier "^5.1.0" - yargs "^17.0.1" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" electron-context-menu@^3.1.2: - version "3.5.0" - resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz#f5d6df982e37555a77666bcecff59b094211b54a" - integrity sha512-z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg== + version "3.6.0" + resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz#d60fabb99d5bb06c46b6929c342c75cc0eee348e" + integrity sha512-7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw== dependencies: cli-truncate "^2.1.0" electron-dl "^3.2.1" electron-is-dev "^2.0.0" electron-dl@^3.2.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz#14164595bebcc636c671eb791b2a3265003f76c4" - integrity sha512-kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A== + version "3.4.1" + resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz#2d74a47a04eb8a042c90480cb59736c6f2626219" + integrity sha512-NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA== dependencies: ext-name "^5.0.0" pupa "^2.0.1" @@ -751,14 +686,14 @@ electron-osx-sign@^0.6.0: minimist "^1.2.0" plist "^3.0.1" -electron-publish@23.3.3: - version "23.3.3" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz#c4125fbb00620acb854f6e994fd3ab3115662ddd" - integrity sha512-1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ== +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "23.3.3" - builder-util-runtime "9.0.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chalk "^4.1.1" fs-extra "^10.0.0" lazy-val "^1.0.5" @@ -772,10 +707,10 @@ electron-window-state@^5.0.3: jsonfile "^4.0.0" mkdirp "^0.5.1" -electron@^20.1.4: - version "20.1.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-20.1.4.tgz#d25b549f14376f99a0a239e27d67ef8515b4a5a0" - integrity sha512-7ov5kgSQi2JewV5SrVfjGasUvyScjuJrrDCW0rYxtP2SMe3JjoP4rsOOnh3ps2P/Nrdlbv+0ygiK0zp4ARCZ+A== +electron@^21.2.2: + version "21.2.2" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz#e2f3dd014981df555d2cd1655590168b404edae4" + integrity sha512-Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" @@ -984,13 +919,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -1025,7 +953,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: +graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.10" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== @@ -1052,11 +980,6 @@ has-symbols@^1.0.3: resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -1118,16 +1041,6 @@ immediate@~3.0.5: resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -1141,23 +1054,11 @@ inherits@2: resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - -ini@^1.3.4, ini@~1.3.0: +ini@^1.3.4: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -is-ci@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w== - dependencies: - ci-info "^2.0.0" - is-ci@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" @@ -1170,44 +1071,11 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== -is-typedarray@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - isbinaryfile@^3.0.2: version "3.0.3" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" @@ -1285,13 +1153,6 @@ keyv@^3.0.0: dependencies: json-buffer "3.0.0" -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" @@ -1333,13 +1194,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -make-dir@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - matcher@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" @@ -1390,7 +1244,12 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" -minimist@^1.2.0, minimist@^1.2.6: +minimist@^1.2.0: + version "1.2.7" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== + +minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== @@ -1472,16 +1331,6 @@ p-cancelable@^1.0.0: resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -1543,23 +1392,13 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.0.1, pupa@^2.1.1: +pupa@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== dependencies: escape-goat "^2.0.0" -rc@1.2.8, rc@^1.2.8: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - read-config-file@6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" @@ -1571,20 +1410,6 @@ read-config-file@6.2.0: json5 "^2.2.0" lazy-val "^1.0.4" -registry-auth-token@^4.0.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz#f02d49c3668884612ca031419491a13539e21fac" - integrity sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg== - dependencies: - rc "1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -1638,25 +1463,23 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.2.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.3.2, semver@^7.3.4, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== +semver@^7.3.2, semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== dependencies: lru-cache "^6.0.0" +semver@~7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" + integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== + serialize-error@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" @@ -1676,10 +1499,12 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -signal-exit@^3.0.2: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== +simple-update-notifier@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz#7edf75c5bdd04f88828d632f762b2bc32996a9cc" + integrity sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew== + dependencies: + semver "~7.0.0" slice-ansi@^3.0.0: version "3.0.0" @@ -1732,7 +1557,7 @@ stat-mode@^1.0.0: resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -1748,11 +1573,6 @@ strip-ansi@^6.0.0, strip-ansi@^6.0.1: dependencies: ansi-regex "^5.0.1" -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== - sumchecker@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" @@ -1768,9 +1588,9 @@ supports-color@^7.1.0: has-flag "^4.0.0" tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== + version "6.1.12" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz#3b742fb05669b55671fb769ab67a7791ea1a62e6" + integrity sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -1823,35 +1643,16 @@ type-fest@^0.13.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - typescript@~4.8.3: - version "4.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz#d59344522c4bc464a65a730ac695007fdb66dd88" - integrity sha512-goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig== + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== typo-js@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - universalify@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -1870,26 +1671,6 @@ unused-filename@^2.1.0: modify-filename "^1.1.0" path-exists "^4.0.0" -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -1925,13 +1706,6 @@ which@^2.0.1: dependencies: isexe "^2.0.0" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" @@ -1946,21 +1720,6 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== - xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: version "15.1.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" @@ -1981,12 +1740,12 @@ yargs-parser@^21.0.0: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== -yargs@^17.0.1: - version "17.5.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz#e109900cab6fcb7fd44b1d8249166feb0b36e58e" - integrity sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA== +yargs@^17.5.1: + version "17.6.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz#712508771045019cda059bc1ba3ae091aaa1402e" + integrity sha512-leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg== dependencies: - cliui "^7.0.2" + cliui "^8.0.1" escalade "^3.1.1" get-caller-file "^2.0.5" require-directory "^2.1.1" diff --git a/pkgs/applications/office/micropad/yarn.nix b/pkgs/applications/office/micropad/yarn.nix index b0a4f2720424..71457edcd05c 100644 --- a/pkgs/applications/office/micropad/yarn.nix +++ b/pkgs/applications/office/micropad/yarn.nix @@ -114,19 +114,19 @@ }; } { - name = "_types_node___node_18.7.18.tgz"; + name = "_types_node___node_18.11.9.tgz"; path = fetchurl { - name = "_types_node___node_18.7.18.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz"; - sha512 = "m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg=="; + name = "_types_node___node_18.11.9.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz"; + sha512 = "CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg=="; }; } { - name = "_types_node___node_16.11.59.tgz"; + name = "_types_node___node_16.18.3.tgz"; path = fetchurl { - name = "_types_node___node_16.11.59.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz"; - sha512 = "6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw=="; + name = "_types_node___node_16.18.3.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz"; + sha512 = "jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg=="; }; } { @@ -154,11 +154,11 @@ }; } { - name = "_types_yargs___yargs_17.0.12.tgz"; + name = "_types_yargs___yargs_17.0.13.tgz"; path = fetchurl { - name = "_types_yargs___yargs_17.0.12.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.12.tgz"; - sha512 = "Nz4MPhecOFArtm81gFQvQqdV7XYCrWKx5uUt6GNHredFHn1i2mtWqXTON7EPXMtNi1qjtjEM/VCHDhcHsAMLXQ=="; + name = "_types_yargs___yargs_17.0.13.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; + sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; }; } { @@ -193,14 +193,6 @@ sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; } - { - name = "ansi_align___ansi_align_3.0.1.tgz"; - path = fetchurl { - name = "ansi_align___ansi_align_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz"; - sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w=="; - }; - } { name = "ansi_regex___ansi_regex_5.0.1.tgz"; path = fetchurl { @@ -226,11 +218,11 @@ }; } { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.3.3.tgz"; - sha512 = "m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ=="; + name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; + sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; }; } { @@ -337,14 +329,6 @@ sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; }; } - { - name = "boxen___boxen_5.1.2.tgz"; - path = fetchurl { - name = "boxen___boxen_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz"; - sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; - }; - } { name = "brace_expansion___brace_expansion_1.1.11.tgz"; path = fetchurl { @@ -418,19 +402,19 @@ }; } { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.0.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz"; - sha512 = "SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA=="; + name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; + sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; }; } { - name = "builder_util___builder_util_23.3.3.tgz"; + name = "builder_util___builder_util_23.6.0.tgz"; path = fetchurl { - name = "builder_util___builder_util_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.3.3.tgz"; - sha512 = "MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA=="; + name = "builder_util___builder_util_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; + sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; }; } { @@ -441,14 +425,6 @@ sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg=="; }; } - { - name = "camelcase___camelcase_6.3.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz"; - sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; - }; - } { name = "chalk___chalk_4.1.2.tgz"; path = fetchurl { @@ -474,27 +450,11 @@ }; } { - name = "ci_info___ci_info_2.0.0.tgz"; + name = "ci_info___ci_info_3.5.0.tgz"; path = fetchurl { - name = "ci_info___ci_info_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz"; - sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; - }; - } - { - name = "ci_info___ci_info_3.4.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.4.0.tgz"; - sha512 = "t5QdPT5jq3o262DOQ8zA6E1tlH2upmUc4Hlvrbx1pGYJuiiHl7O7rvVNI+l8HTVhd/q3Qc9vqimkNk5yiXsAug=="; - }; - } - { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - path = fetchurl { - name = "cli_boxes___cli_boxes_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz"; - sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; + name = "ci_info___ci_info_3.5.0.tgz"; + url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; + sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; }; } { @@ -506,11 +466,11 @@ }; } { - name = "cliui___cliui_7.0.4.tgz"; + name = "cliui___cliui_8.0.1.tgz"; path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; + name = "cliui___cliui_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; + sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; }; } { @@ -593,14 +553,6 @@ sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; }; } - { - name = "configstore___configstore_5.0.1.tgz"; - path = fetchurl { - name = "configstore___configstore_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz"; - sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; - }; - } { name = "core_util_is___core_util_is_1.0.2.tgz"; path = fetchurl { @@ -625,14 +577,6 @@ sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; }; } - { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } { name = "debug___debug_4.3.4.tgz"; path = fetchurl { @@ -657,14 +601,6 @@ sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; }; } - { - name = "deep_extend___deep_extend_0.6.0.tgz"; - path = fetchurl { - name = "deep_extend___deep_extend_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz"; - sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; - }; - } { name = "defer_to_connect___defer_to_connect_1.1.3.tgz"; path = fetchurl { @@ -722,11 +658,11 @@ }; } { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; path = fetchurl { - name = "dmg_builder___dmg_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.3.3.tgz"; - sha512 = "ECwAjt+ZWyOvddrkDx1xRD6IVUCZb5SV6vSMHZd+Va3G2sUXHrnglR1cGDKRF4oYRQm8SYVrpLZKbi8npyDcAQ=="; + name = "dmg_builder___dmg_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; + sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; }; } { @@ -737,14 +673,6 @@ sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; }; } - { - name = "dot_prop___dot_prop_5.3.0.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; - sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; - }; - } { name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; path = fetchurl { @@ -778,27 +706,27 @@ }; } { - name = "electron_builder___electron_builder_23.3.3.tgz"; + name = "electron_builder___electron_builder_23.6.0.tgz"; path = fetchurl { - name = "electron_builder___electron_builder_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.3.3.tgz"; - sha512 = "mFYYdhoFPKevP6y5uaaF3dusmB2OtQ/HnwwpyOePeU7QDS0SEIAUokQsHUanAiJAZcBqtY7iyLBgX18QybdFFw=="; + name = "electron_builder___electron_builder_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; + sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; }; } { - name = "electron_context_menu___electron_context_menu_3.5.0.tgz"; + name = "electron_context_menu___electron_context_menu_3.6.0.tgz"; path = fetchurl { - name = "electron_context_menu___electron_context_menu_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.5.0.tgz"; - sha512 = "z4agpok6YnXlGFs66zU9EBFft4llUFJ41NYFEMMS0fnprMKBztJUCHBA6LMAqJgjabfqsYC7kxlvjvepxodOqg=="; + name = "electron_context_menu___electron_context_menu_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.0.tgz"; + sha512 = "7uhF3WX7ZalLEurKqML2cJJrBUw1JSZNzbwIB9kVbip7sVwyl7bVjiwHzdYjuOh/+xHw21ZzxwgZcB6sTeKdEw=="; }; } { - name = "electron_dl___electron_dl_3.3.1.tgz"; + name = "electron_dl___electron_dl_3.4.1.tgz"; path = fetchurl { - name = "electron_dl___electron_dl_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz"; - sha512 = "kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A=="; + name = "electron_dl___electron_dl_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.4.1.tgz"; + sha512 = "NUrjWTlFW7n/+0ECxQ1AkjikNxdeRDpaprLY7YhmOg6pkFcPHwdEfpkTK+CIhyGMAlZOuto1clB1z5HAwgZcaA=="; }; } { @@ -818,11 +746,11 @@ }; } { - name = "electron_publish___electron_publish_23.3.3.tgz"; + name = "electron_publish___electron_publish_23.6.0.tgz"; path = fetchurl { - name = "electron_publish___electron_publish_23.3.3.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.3.3.tgz"; - sha512 = "1dX17eE5xVXedTxjC+gjsP74oC0+sIHgqysp0ryTlF9+yfQUyXjBk6kcK+zhtBA2SsHMSglDtM+JPxDD/WpPTQ=="; + name = "electron_publish___electron_publish_23.6.0.tgz"; + url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; + sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; }; } { @@ -834,11 +762,11 @@ }; } { - name = "electron___electron_20.1.4.tgz"; + name = "electron___electron_21.2.2.tgz"; path = fetchurl { - name = "electron___electron_20.1.4.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-20.1.4.tgz"; - sha512 = "7ov5kgSQi2JewV5SrVfjGasUvyScjuJrrDCW0rYxtP2SMe3JjoP4rsOOnh3ps2P/Nrdlbv+0ygiK0zp4ARCZ+A=="; + name = "electron___electron_21.2.2.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-21.2.2.tgz"; + sha512 = "Q0j1tzLTM5JRjSJVAfDSONZgdtuyruHR1pc1y2IbMYQz62pVJWVWAvcJXzpty5iRh2HKzW9+B9WVlmfWNFA8ag=="; }; } { @@ -1073,14 +1001,6 @@ sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; }; } - { - name = "global_dirs___global_dirs_3.0.0.tgz"; - path = fetchurl { - name = "global_dirs___global_dirs_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz"; - sha512 = "v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA=="; - }; - } { name = "global_tunnel_ng___global_tunnel_ng_2.7.1.tgz"; path = fetchurl { @@ -1145,14 +1065,6 @@ sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; }; } - { - name = "has_yarn___has_yarn_2.1.0.tgz"; - path = fetchurl { - name = "has_yarn___has_yarn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz"; - sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; - }; - } { name = "has___has_1.0.3.tgz"; path = fetchurl { @@ -1225,22 +1137,6 @@ sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; }; } - { - name = "import_lazy___import_lazy_2.1.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz"; - sha512 = "m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } { name = "inflight___inflight_1.0.6.tgz"; path = fetchurl { @@ -1257,14 +1153,6 @@ sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; } - { - name = "ini___ini_2.0.0.tgz"; - path = fetchurl { - name = "ini___ini_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz"; - sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; - }; - } { name = "ini___ini_1.3.8.tgz"; path = fetchurl { @@ -1273,14 +1161,6 @@ sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; } - { - name = "is_ci___is_ci_2.0.0.tgz"; - path = fetchurl { - name = "is_ci___is_ci_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz"; - sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; - }; - } { name = "is_ci___is_ci_3.0.1.tgz"; path = fetchurl { @@ -1297,38 +1177,6 @@ sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; } - { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - path = fetchurl { - name = "is_installed_globally___is_installed_globally_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz"; - sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; - }; - } - { - name = "is_npm___is_npm_5.0.0.tgz"; - path = fetchurl { - name = "is_npm___is_npm_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz"; - sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; path = fetchurl { @@ -1337,22 +1185,6 @@ sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } - { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - path = fetchurl { - name = "is_yarn_global___is_yarn_global_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz"; - sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; - }; - } { name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; path = fetchurl { @@ -1449,14 +1281,6 @@ sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; } - { - name = "latest_version___latest_version_5.1.0.tgz"; - path = fetchurl { - name = "latest_version___latest_version_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz"; - sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; - }; - } { name = "lazy_val___lazy_val_1.0.5.tgz"; path = fetchurl { @@ -1513,14 +1337,6 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } { name = "matcher___matcher_3.0.0.tgz"; path = fetchurl { @@ -1585,6 +1401,14 @@ sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; }; } + { + name = "minimist___minimist_1.2.7.tgz"; + path = fetchurl { + name = "minimist___minimist_1.2.7.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; + sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; + }; + } { name = "minimist___minimist_1.2.6.tgz"; path = fetchurl { @@ -1697,14 +1521,6 @@ sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw=="; }; } - { - name = "package_json___package_json_6.5.0.tgz"; - path = fetchurl { - name = "package_json___package_json_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz"; - sha512 = "k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ=="; - }; - } { name = "path_exists___path_exists_4.0.0.tgz"; path = fetchurl { @@ -1801,14 +1617,6 @@ sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; } - { - name = "rc___rc_1.2.8.tgz"; - path = fetchurl { - name = "rc___rc_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz"; - sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; - }; - } { name = "read_config_file___read_config_file_6.2.0.tgz"; path = fetchurl { @@ -1817,22 +1625,6 @@ sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; }; } - { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - path = fetchurl { - name = "registry_auth_token___registry_auth_token_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; - sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; - }; - } - { - name = "registry_url___registry_url_5.1.0.tgz"; - path = fetchurl { - name = "registry_url___registry_url_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz"; - sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; - }; - } { name = "require_directory___require_directory_2.1.1.tgz"; path = fetchurl { @@ -1897,14 +1689,6 @@ sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; } - { - name = "semver_diff___semver_diff_3.1.1.tgz"; - path = fetchurl { - name = "semver_diff___semver_diff_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz"; - sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; - }; - } { name = "semver___semver_6.3.0.tgz"; path = fetchurl { @@ -1914,11 +1698,19 @@ }; } { - name = "semver___semver_7.3.7.tgz"; + name = "semver___semver_7.3.8.tgz"; path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + name = "semver___semver_7.3.8.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; + sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; + }; + } + { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; } { @@ -1946,11 +1738,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.7.tgz"; + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; + name = "simple_update_notifier___simple_update_notifier_1.0.7.tgz"; + url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; }; } { @@ -2033,14 +1825,6 @@ sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; } - { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; - }; - } { name = "sumchecker___sumchecker_3.0.1.tgz"; path = fetchurl { @@ -2058,11 +1842,11 @@ }; } { - name = "tar___tar_6.1.11.tgz"; + name = "tar___tar_6.1.12.tgz"; path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; + name = "tar___tar_6.1.12.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.12.tgz"; + sha512 = "jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw=="; }; } { @@ -2122,27 +1906,11 @@ }; } { - name = "type_fest___type_fest_0.20.2.tgz"; + name = "typescript___typescript_4.8.4.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - path = fetchurl { - name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz"; - sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; - }; - } - { - name = "typescript___typescript_4.8.3.tgz"; - path = fetchurl { - name = "typescript___typescript_4.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.3.tgz"; - sha512 = "goMHfm00nWPa8UvR/CPSvykqf6dVV8x/dp0c5mFTMTIu0u0FlGWRioyy7Nn0PGAdHxpJZnuO/ut+PpQ8UiHAig=="; + name = "typescript___typescript_4.8.4.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz"; + sha512 = "QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ=="; }; } { @@ -2153,14 +1921,6 @@ sha512 = "C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw=="; }; } - { - name = "unique_string___unique_string_2.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { @@ -2185,14 +1945,6 @@ sha512 = "BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg=="; }; } - { - name = "update_notifier___update_notifier_5.1.0.tgz"; - path = fetchurl { - name = "update_notifier___update_notifier_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz"; - sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; - }; - } { name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { @@ -2233,14 +1985,6 @@ sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; }; } - { - name = "widest_line___widest_line_3.1.0.tgz"; - path = fetchurl { - name = "widest_line___widest_line_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz"; - sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; - }; - } { name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; path = fetchurl { @@ -2257,22 +2001,6 @@ sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } - { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz"; - sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; - }; - } - { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - path = fetchurl { - name = "xdg_basedir___xdg_basedir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"; - sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; - }; - } { name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; path = fetchurl { @@ -2306,11 +2034,11 @@ }; } { - name = "yargs___yargs_17.5.1.tgz"; + name = "yargs___yargs_17.6.1.tgz"; path = fetchurl { - name = "yargs___yargs_17.5.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.5.1.tgz"; - sha512 = "t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA=="; + name = "yargs___yargs_17.6.1.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.1.tgz"; + sha512 = "leBuCGrL4dAd6ispNOGsJlhd0uZ6Qehkbu/B9KCR+Pxa/NVdNwi+i31lo0buCm6XxhJQFshXCD0/evfV4xfoUg=="; }; } { From a7284bf3dcf6063e37df4479aca52a798210969a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 02:40:46 +0000 Subject: [PATCH 134/223] alfis: 0.8.2 -> 0.8.3 --- pkgs/applications/blockchains/alfis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix index 62f21dff30f3..677915066eb0 100644 --- a/pkgs/applications/blockchains/alfis/default.nix +++ b/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-E0n1keNk5jNnErNvYhb8oe26kK9Opl+IJ5zpsvrqS84="; + sha256 = "sha256-QOKFnre5MW9EvrKrKBHWpOxi2fBKTDMhzCDX3ISd2cQ="; }; - cargoSha256 = "sha256-kbo3OMLYA/5xctz/YhQNd8IYlyCQB7D/8rCHZwjvlMI="; + cargoSha256 = "sha256-D+3HIyj1zbs5m8hwLpITS25u/wrRM5GfnwlUUuLX8DQ="; checkFlags = [ # these want internet access, disable them From 76c4748d4db17c521a0d2ff1fcef0a7ca2309345 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 01:00:11 +0000 Subject: [PATCH 135/223] clojure-lsp: 2022.10.05-16.39.51 -> 2022.11.03-00.14.57 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 5334ea0df8a8..5d6d4c1583c4 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.10.05-16.39.51"; + version = "2022.11.03-00.14.57"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-44GAG9PSLpeV6rBGnw6f0EvmQDwCGtrTbPrKWx5pP8Q="; + sha256 = "sha256-NtvW0KT6d0k2oN//7xaTnBIoLKkc7zQFj3VdoFdgBWI="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "7976ad30713ff0886421de42906622aa84d1409b37c8d603189059201daa4fb3"; + sha256 = "49e0a848dc32216a60f48eca68ff476cb69b999f6a79fb7310bf9fb2ffcaf4b6"; }; extraNativeImageBuildArgs = [ From a45822979bf27f4498421a4157ce45895b53f069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Oct 2022 19:37:24 +0000 Subject: [PATCH 136/223] kubemq-community: 2.3.3 -> 2.3.4 --- pkgs/servers/kubemq-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix index 78fd6e9b96d4..81e9e1b671fa 100644 --- a/pkgs/servers/kubemq-community/default.nix +++ b/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.3.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rZlWVbAmmZ1w6YSb481GHl64aUvdehPVAqYpwk48RGA="; + sha256 = "sha256-+HJpjKMSndcV+xQJM+FesdtoUSGHnpILQFuf3sbxBY0="; }; CGO_ENABLED=0; From 98f64d342525c5e8ffb46edcf8eb929cdaac5795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 23:16:39 +0000 Subject: [PATCH 137/223] apt: 2.5.2 -> 2.5.4 --- pkgs/tools/package-management/apt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 352bf98a7068..cad54499e304 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.5.2"; + version = "2.5.4"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-zFw3TCgxyeOQ2cXwgCmoHDyit3irwN0UJsgcZXYo/p0="; + hash = "sha256-fFD2P6j4sozee0UFXfFok304LyiwBF1RM4KbcGNu+HI="; }; nativeBuildInputs = [ From 514072bd0784ad27c009aeaa8ace459db48ad93a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 08:43:46 +0000 Subject: [PATCH 138/223] oh-my-zsh: 2022-11-03 -> 2022-11-04 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 4ac74902bd49..92e3c6d0f300 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-11-03"; + version = "2022-11-04"; pname = "oh-my-zsh"; - rev = "b3b336b0f95644ceda7758871191cdf040b897b2"; + rev = "80fdbc9b91a9acca42fb90065b5e64a9722978a7"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "azQ2ceqRnvugNI/1ORZXb+5zrv0PXvwYd2Zc85VXSo4="; + sha256 = "dapyDDtQ8JUE3PpmHo9DLtt0gEBOrHqoC8wMZeQFUts="; }; strictDeps = true; From 29943858a96707e2a885e249664ad6d574f49c4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Sep 2022 06:19:30 +0000 Subject: [PATCH 139/223] linuxquota: 4.06 -> 4.09 --- pkgs/tools/misc/linuxquota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index fbfb488f9067..b5fc42be82dc 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { - version = "4.06"; + version = "4.09"; pname = "quota"; src = fetchurl { url = "mirror://sourceforge/linuxquota/quota-${version}.tar.gz"; - sha256 = "sha256-Lz4DA583jU8Nl6zbSdr1gdyq1k0uHd8SlJX9V5+9Jo0="; + sha256 = "sha256-nNrKFUvJKvwxF/Dl9bMgjdX4RYOvHPBhw5uqCiuxQvk="; }; outputs = [ "out" "dev" "doc" "man" ]; From e4230d0c89098cca44db1456959e825c6bbabe26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Oct 2022 11:54:46 +0000 Subject: [PATCH 140/223] pipenv: 2022.10.12 -> 2022.10.25 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index abf965f4a021..63ab2100f6d0 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.10.12"; + version = "2022.10.25"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pNiPZmfLzZ6kMtYmqLNzzTEBiGufuWTqfn+WUKg/wwc="; + sha256 = "sha256-PjnI1aK8qrMkVSoYV2EFwqNeAguzEf9T106stYuFGFM="; }; LC_ALL = "en_US.UTF-8"; From 5c1a9de616925910a66481e8a4cbedab527a1dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Nov 2022 07:34:37 +0000 Subject: [PATCH 141/223] grandorgue: 3.8.0-1 -> 3.9.0-1 --- pkgs/applications/audio/grandorgue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 33c64e079460..5fe2ca2ce645 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.8.0-1"; + version = "3.9.0-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-VXf2B5NK6lrcNXUiTTjYhfBVrTWusyadD+5ySkmelsI="; + sha256 = "sha256-+LWEjoke7f+6f4K4jO9nCG88Mdg9C49+v3FboM9/NkU="; }; postPatch = '' From f6edde4214c9572b723ad1847a32d030c64374a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 10:01:59 +0100 Subject: [PATCH 142/223] natscli: 0.0.34 -> 0.0.35 --- pkgs/tools/system/natscli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix index 8b461fa7f3c6..830809593633 100644 --- a/pkgs/tools/system/natscli/default.nix +++ b/pkgs/tools/system/natscli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "natscli"; - version = "0.0.34"; + version = "0.0.35"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tDs0OrMeWLhBUnngJRBmAauwMA/zdMC4ED7xcCED4Zs="; + sha256 = "sha256-Sro0EwHP1pszuOYP6abZO5XjJvbXrDDeSAbzPA2p00M="; }; - vendorSha256 = "sha256-Wv0V1/BbO8cP9Qj1TBCDpPTpbv3xzT8eCLPBhCPxRKo="; + vendorSha256 = "sha256-HSKBUw9ZO150hLXyGX66U9XpLX2yowxYVdcdDVdqrAc="; meta = with lib; { description = "NATS Command Line Interface"; From 17be899fcd06415af6a03c2cab48760eee5e656c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 10:05:44 +0100 Subject: [PATCH 143/223] python310Packages.pyxiaomigateway: 0.14.1 -> 0.14.3 --- pkgs/development/python-modules/pyxiaomigateway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxiaomigateway/default.nix b/pkgs/development/python-modules/pyxiaomigateway/default.nix index 015d07be09b9..0d60916724b5 100644 --- a/pkgs/development/python-modules/pyxiaomigateway/default.nix +++ b/pkgs/development/python-modules/pyxiaomigateway/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pyxiaomigateway"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyXiaomiGateway"; rev = version; - sha256 = "sha256-e/FqqUl90VFDJD6ZFbFqXKH3s2sBaDjSFEvaKJhDlGg="; + sha256 = "sha256-TAbZvs1RrUy9+l2KpfbBopc3poTy+M+Q3ERQLFYbQis="; }; propagatedBuildInputs = [ cryptography ]; From afae4d8f2880845cebc0b63560b1bf5537246f62 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 10:34:42 +0100 Subject: [PATCH 144/223] python310Packages.asyncclick: 8.0.1.3 -> 8.1.3.2 --- pkgs/development/python-modules/asyncclick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncclick/default.nix b/pkgs/development/python-modules/asyncclick/default.nix index e49fda936c83..f9b12e553420 100644 --- a/pkgs/development/python-modules/asyncclick/default.nix +++ b/pkgs/development/python-modules/asyncclick/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "asyncclick"; - version = "8.0.1.3"; + version = "8.1.3.2"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python-trio"; repo = pname; rev = version; - sha256 = "03b8zz8i3aqzxr3ffzb4sxnrcm3gsk9r4hmr0fkml1ahi754bx2r"; + sha256 = "sha256-by1clF+WAfN/gjOg/F60O1tCZ3qAhWqiiJJY04iMzQ8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From d2ef363cc1e1816e1c9a92440d40367cf60a2414 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 5 Nov 2022 17:38:19 +0800 Subject: [PATCH 145/223] eksctl: 0.115.0 -> 0.117.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 db993c049665..7f79d5dabc8a 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.115.0"; + version = "0.117.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-IIxg0xaRfd7jKS4AkSFHcObQmKSRCnQ+K68by8aZlAc="; + sha256 = "sha256-3OYhwl+oJNSAYI5RLJgdZgq8teqkjCHy5r/XOqJdz7I="; }; - vendorSha256 = "sha256-glMu2GwMWsuIjLjCwskH90wn690tosLTCThd4LUZobo="; + vendorSha256 = "sha256-a5E6a+DFrbAA2/sznrKbE4IP68f49+Nbiujx94snryQ="; doCheck = false; From b34f18aed9bbc984ec78efe45e7daf84bf380c41 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 5 Nov 2022 10:45:55 +0100 Subject: [PATCH 146/223] cargo-generate: fix by skipping failing test --- pkgs/development/tools/rust/cargo-generate/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index dec12ef677aa..8064de4d2b3d 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -38,8 +38,12 @@ rustPlatform.buildRustPackage rec { # Exclude some tests that don't work in sandbox: # - favorites_default_to_git_if_not_defined: requires network access to github.com # - should_canonicalize: the test assumes that it will be called from the /Users// folder on darwin variant. - checkFlags = [ "--skip favorites::favorites_default_to_git_if_not_defined" ] - ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ]; + checkFlags = [ + "--skip favorites::favorites_default_to_git_if_not_defined" + # Probably git 2.38.1 releated failure + # Upstream issue https://github.com/cargo-generate/cargo-generate/issues/777 + "--skip basics::it_loads_a_submodule" + ] ++ lib.optionals stdenv.isDarwin [ "--skip git::utils::should_canonicalize" ]; meta = with lib; { description = "cargo, make me a project"; From bc127cc35ce431594bf2d5a6cb315becde61cf83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 10:24:26 +0000 Subject: [PATCH 147/223] python310Packages.PyGithub: 1.56 -> 1.57 --- pkgs/development/python-modules/pyGithub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index d0ebca394460..5703f9dbf23a 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "PyGithub"; - version = "1.56"; + version = "1.57"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "refs/tags/v${version}"; - sha256 = "sha256-L6xrv3dAT/sWt/7ZeDy3P095g7Lpht52LkfCVYNLkbA="; + sha256 = "sha256-7CNvSOwDXXcJ082/Fmgr6OtTQeA30yDjt/Oq2nx4vEk="; }; propagatedBuildInputs = [ From c60cb848d995b418bc20a1beb7399e97ebe81df7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 5 Nov 2022 10:25:00 +0000 Subject: [PATCH 148/223] python310Packages.PyGithub: add format attribute --- pkgs/development/python-modules/pyGithub/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 5703f9dbf23a..7facf0c0032d 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -12,6 +12,7 @@ buildPythonPackage rec { pname = "PyGithub"; version = "1.57"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { @@ -36,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to access the GitHub API v3"; homepage = "https://github.com/PyGithub/PyGithub"; - platforms = platforms.all; + changelog = "https://github.com/PyGithub/PyGithub/raw/v${version}/doc/changes.rst"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jhhuh ]; }; From 69d5c86471fa5bef6da054e6556bc2c7423bef06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 11:31:29 +0100 Subject: [PATCH 149/223] firefox-bin-unwrapped: 106.0.3 -> 106.0.5 https://www.mozilla.org/en-US/firefox/106.0.4/releasenotes/ https://www.mozilla.org/en-US/firefox/106.0.5/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 786 +++++++++--------- 1 file changed, 393 insertions(+), 393 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index da43a04f5a54..6f4fbe9f2e9e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "106.0.3"; + version = "106.0.5"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ach/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ach/firefox-106.0.5.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "31fb0e887239284858725cdc9ca12336964425e204812fe7fb152eedd4b2a900"; + sha256 = "de20c9b8647ee05b5105451eaf1089ec1ec8fe66b3a7d28f763d1ccff72d00d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/af/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/af/firefox-106.0.5.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "49857fbdeaa48ba225e1b4804b4958f4df1701f677b38da75f308169f5ba0398"; + sha256 = "88dbfd37789f97bd50150c0688c982624e2cae00f019df8c7963e189a70be88e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/an/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/an/firefox-106.0.5.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "420f848d1510256f431a412a59ea8c321f0b6ca3414a947a9932037b01c66881"; + sha256 = "000975748e3093e1a071fc96c5d5ba096964172e01a8ea77a68a730c46e03885"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ar/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ar/firefox-106.0.5.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b108d4c7989e55863d54fe43bbdf1ab95ac6f2ee63265be3ec8a2c6d1e89370d"; + sha256 = "9062d287f1bf9f5600045ccea06dccfcf29963f927047f53db98e97434ede817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ast/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ast/firefox-106.0.5.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5887bef188ce5bc9261e9ba5b335800c5918a1ab9a5ff64f549a4d2d1fef6bbc"; + sha256 = "d1887a1c5b5b500cd86f701ac98135d3cc86214ded3a5086743e749f14611c04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/az/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/az/firefox-106.0.5.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "faa0fc42cdc7fd594dcbf8873913144f881be036e553b9b913ec5b825f2358ad"; + sha256 = "82c6eb89b389e7547b8d0c74c19de7f889a4fe41837f1967230addb70af3234d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/be/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/be/firefox-106.0.5.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "01ef94bd46b2cf6933517b048452a665b260291f7eeb6c71ede047e19942668b"; + sha256 = "c0de3d082549c9fc1abd82c33821b123b78c2f18d98c6a048eb71722287a20ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bg/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bg/firefox-106.0.5.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c800c227b1c6e55f6d2d080d03f72d4469a1452be5c388e472ceb0b99107f20b"; + sha256 = "1ddd268c0441b7ff4ab6df3aa5e2b869f0a2090f7f2520888ad121e781c8e50a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bn/firefox-106.0.5.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "aef3853b5fcaeb794cb2014ee7ce2c4d31692cf2a8ecdab5fc276645c20d4c61"; + sha256 = "b324b6d3ef4ecdf9719fb9033770e21aaf599c5ee50cac30674cd00372a39e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/br/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/br/firefox-106.0.5.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "11be73589548959ce15e1ab8c2d5c90a918cc8541bb51707b5b12bc29404aa59"; + sha256 = "a82f3113f98d8fe6ae36598130dbf3a22417078fff697a1f1965cd42c3aa3b51"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/bs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/bs/firefox-106.0.5.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "9d38beb6e0b5070c6370994bd7f714e4b435f82bb802f708d0b32f1665ba674d"; + sha256 = "608ce5cd8e10d5229b9b35ba022e83efe1dea9a344ba02ae1c393c60f0a89cbd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ca-valencia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ca-valencia/firefox-106.0.5.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e25facfe1cf74cf83a5afb47e912d59c80b66d276cbac794a43c7871c9a2706d"; + sha256 = "11058ac996d040d1290280a28cdbeb2fb39930de10c66cd1c242688eed21fc0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ca/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ca/firefox-106.0.5.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "2bc2c0031ca385bbd3935d53824887e047478509fef3941511fb61c35c981616"; + sha256 = "fdf9e15faa3e6c0de727a1bcbe37ffd50b18f2a9029c94af4a95afc11d51493e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cak/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cak/firefox-106.0.5.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "774147fb330ad37ab5455954fcad9daad265d8ae996c5efec85120926ee20b65"; + sha256 = "437153e634cf3886756f9fe5cdcea75689959e9a8bd5eb23635ef59e7caac4b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cs/firefox-106.0.5.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ecce0b2298fd44a63026ee1d057d02972e168e7c0ee792ba404ecb8f573fe618"; + sha256 = "f81f3c40dae9c1df4fccf318898fd3e1a819847361f888ed8f4a230f99436b4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/cy/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/cy/firefox-106.0.5.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0e70e7413d7e72ef44fc905ff4689e47bec3224533c17c8e8751a814801e8ac6"; + sha256 = "fd3ac9eb5bd3fd61144320bf826555ee1181ba7fc1f19d0ce697760e755b249d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/da/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/da/firefox-106.0.5.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "27997c29c7db7bf928559beaa42d2478e8c18c05494307c6dbd1ea66f1307fdc"; + sha256 = "bbc0762c9e579d4cbf30e90a22596ae0848b5de7f0ba444afbe822741a9a3be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/de/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/de/firefox-106.0.5.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "58477c226f5e30bcfdebd5b7a7cfed154eb277dc227e0d57f0fc5b34d4785869"; + sha256 = "1931181943067d3a65c1e656a6f85780d9f512b1a8a8bcee966b1d92d3ba186a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/dsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/dsb/firefox-106.0.5.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "4cdbef5b1daa86c8ded63fd71f847d81b1a81067ad721ee31f7763d0152214af"; + sha256 = "24a2fe0f1f276669fa33a2d6005afae7082ca0c6f93d73609b0a02b96b0537cc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/el/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/el/firefox-106.0.5.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "20422b61965b700acf7beea92d09e7f5bdc71cb2228451a5559b06433c949a7a"; + sha256 = "3d3e6008651d2518adedb75b3c0ef4ac9d20c67a2fac296f20fc6b4ee5c76046"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-CA/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-CA/firefox-106.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f95f69a3c742a8693d3331f582bdf1086c8142de0fd790148a7db3ef597f8769"; + sha256 = "905fdbaba632a8b1edbd5db3122013b1c4a8c8e09d5c6a11463226d174b56e08"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-GB/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-GB/firefox-106.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "f511ef6add6fb5ebeb711d2b7fc1f0f8b79545c3f22a17b91ff3988d7c43f72a"; + sha256 = "b48660979cf355bf9d45513839b530923fad069c4b3adc6042fbb593869145ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/en-US/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/en-US/firefox-106.0.5.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0c18141ededd6c969f00275eaf26d05933f71bf14143d70d4f5fa74df9411155"; + sha256 = "8fd85cf26df85bc1df86e708763bad84da6486f320c5fd3bb95343cd0804d01d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/eo/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/eo/firefox-106.0.5.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "d177833b695e5ecc92abef14b2957df0087d04763dad69b0598bbb5278885702"; + sha256 = "a9385b94ff73ad5127f84e9c4c78d2ade002d8a5be404db8db890eeca9fafed0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-AR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-AR/firefox-106.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "8f66db37834870232eb60573e29fbae645f3bc88557678565bae835f1f91cc8c"; + sha256 = "eba6c875092125a561a08689c81aef00d39379cb5c9295a289b054c037289321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-CL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-CL/firefox-106.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8e565b5630ecddd2d026b09f3f1fc983ee651d1b6af35d6f3c66277380048413"; + sha256 = "cc87602616b80c806b01e37fe8185e25efeb7bb0a22d659e120ba0f3cb562853"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-ES/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-ES/firefox-106.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "278a50d11dbca9937859334bd4456189c90030a75c697965dfdc17191c96bff3"; + sha256 = "0058b27a15256cb9b1e17e2b20ac869b153ae0dd47df55602f0407fb62481f87"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/es-MX/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/es-MX/firefox-106.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "69bb1b0852b6c10374ab8a332372decfb9b6c8adade223ea934463d17c2dd2ee"; + sha256 = "405a538dd2d0dc6c7cad0f59789c6663d7b52d407c5e4b15c451b02758e45b4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/et/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/et/firefox-106.0.5.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "25859d8df8d4f557e32ef3d4e520428e0d4804824fb95f60644720142acf9de9"; + sha256 = "cd56167f10d8fd754ebdd85cbb942e4462d2ebb951020fdf80e09a993af6fd6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/eu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/eu/firefox-106.0.5.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "3e84112cc7981c763bed273cff26285fc3a7cf0e2b11325165a23958523c24e9"; + sha256 = "1fba6204452d49df48461ee9468b09c68c33536e1dd88ca0ecd3d31a9de38592"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fa/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fa/firefox-106.0.5.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "2096bd82fff97da6ac23d88ed92832503084b30444ed38ee0e61f7245d8a8aa6"; + sha256 = "289d98c4d5f61211313c5ac14daf79bd124c108d503af538cc10d32fe3e228a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ff/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ff/firefox-106.0.5.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f9e58ab7cb3b06482d7e0d0814a41ca8f0319b6130c16080043c2d30fb3786a7"; + sha256 = "dbb7ef853ae7b88fdfbfae511b442439d05371caa11bd3453718ee20d5a20edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fi/firefox-106.0.5.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e365f19a9e58c447f5093ff77208fd972d1bf2afddcc92e9a0cc94ce7c7986a1"; + sha256 = "84b2a50361c62cc0df7ada06e307ee39229c9174179901de4ca48d7e3bbd4a2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fr/firefox-106.0.5.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "0a313be3de9bc834993ea5085290c975485138718131aa83ca52818d22ba97eb"; + sha256 = "f50fa5c5a0f7d4d34cf4413afc89737ad3344b930f80a12bcb8e277012b07e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/fy-NL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/fy-NL/firefox-106.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "991550fdcbaa1be5f8fc3a66989159a67a25fbc8436a488126d99abc76b9ee63"; + sha256 = "5ed8ca07362f91fb7d1e856621519b4acad992caf34c2cc8471f485d8b0fe549"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ga-IE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ga-IE/firefox-106.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "bbd2826156fec3e556fb2a0af5e4a6b056a04d6808a0c8d442648264a3f876b7"; + sha256 = "b4a5d6c721da37c608a7f552a7a5d468d8940e9f257a2009d8b0adf0114290d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gd/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gd/firefox-106.0.5.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "d5517a7292652c26073004055bac3cc3c269e346dce6537698b4945c5c9db00c"; + sha256 = "610bb032370f97045295ab29ec1d611ca404bfe31bf5114e5a9e311b8275a312"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gl/firefox-106.0.5.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8b527884efc8233e42040f3ddba1078149bc54bee41674b37912bc7ba3f04aa2"; + sha256 = "61164548e79b8f7b1382139e376f0bef6fa027bb636249e4249f7d5f8fe96014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gn/firefox-106.0.5.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "615040d2e5b1a9f8a5bf13f7f3485fc63e378d23b0d3ea6ec84ab2aeb926a3f6"; + sha256 = "ed5f643e37f97c9071ff23c4f1570db66b5f45d7083ca49915adee35c8592220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/gu-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/gu-IN/firefox-106.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "8c11d61d431bff7e4725a123ce5dc72067ff57d3b23adb37f2377ebad4168117"; + sha256 = "c1c435ae0dda7d5e3f42092338878e903d0b4d148f1e3d289e70e827979181f0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/he/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/he/firefox-106.0.5.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "101053ad36adbceecc45a001c8bcfb274d1f7381e7aac9994142f99f110983df"; + sha256 = "b8a88dfd487aea0e3433c07a69f8cbc64e72bb47949a6e26b7b2b7a3c8e65966"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hi-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hi-IN/firefox-106.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "3a1b7b8aa61baa363edeb4e78b98ea2dc67ec13ca9dc14c1a6934fc5fc5673fa"; + sha256 = "170b7639f2cfcbbbcf44711c5dc673c5f370313d5e31e320ca61a71570c1e5f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hr/firefox-106.0.5.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7fb991b57ecd01def50948d35b5b8a93dfa00f28f6522b59639877465a2d7c34"; + sha256 = "3a9936ad64ed021a3f5206c3fe4db67a797977ec89475a567cbf5eee34f29739"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hsb/firefox-106.0.5.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b82c58c200f42f9f7fafe555391e714d9cc3dc2ee9a633dbe19e1cebd1012320"; + sha256 = "d555c052f61206e9859761c3a26d700187dd2574a22b5042971a517482a3ca4e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hu/firefox-106.0.5.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "22905b2ef794896557be6112965a593e0b64ca5bad9b65fd6ebf8586b5ced0bc"; + sha256 = "eab88af4ba8dbbca366d4f014bb5e6645f9ea5d8db0682467618eec202c51f19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/hy-AM/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/hy-AM/firefox-106.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "38e33a1273d6f4d4e5b0799b67150e5289427b13674ff981af6946e5ed0d0e68"; + sha256 = "1992e69bbad6642c9b57e907d05e2af6b8225f4b7d9b018a7a6580fba9a47352"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ia/firefox-106.0.5.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "dbcb7470bd85c8b77114f759d4c327981ec27cd16cca668f41061f3f70d3d211"; + sha256 = "3f85c52de056ec59fa7f74b4b475c4390f6bdacbc36b9a8c9faebee6acffb44d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/id/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/id/firefox-106.0.5.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "b0704bead492263ec9c4577ff4a62a0a8991ea037d1c50fb30ca70cc3739431f"; + sha256 = "63598ca91097510ca43b36295524e8bfcbea8d7efbe1750f151df71f0866f7fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/is/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/is/firefox-106.0.5.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "0760f29d86b512d142cb8288bc32c32ba4535b42361946fe9751755b86a5d40e"; + sha256 = "ff17d72653957d7d78796307e060665a8e64ce47360a6aac36817af430f06495"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/it/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/it/firefox-106.0.5.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3bd1d12a7478179de8a88b60c597e83a36cd5865751937810a6650735832aea9"; + sha256 = "43d21db88424f22a2f11dd71381d5ea593a3d1c87deda9db15e30da3e1529bad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ja/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ja/firefox-106.0.5.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f6d977565bcbe67a00bb7b0cd2a981cc8f308a2a6c06008d063a4da6fa8a8125"; + sha256 = "e9446d1c0cdb2f71b76e0493d5c4845d4f7047865393e2d58991b2a5e2c925d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ka/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ka/firefox-106.0.5.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "26288ee314f708a36ccdd584163962a5220398de1e8801c0cbd77fd7daa7a1b1"; + sha256 = "5f1eb6dbc85f08195234f684648eb32f33fa62956add52bc16c45616f1d7ac3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kab/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kab/firefox-106.0.5.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "15257692589a80497c667a171f7348b4ea8db63afea583ce2db948d1be72a095"; + sha256 = "c4c6b2046362c27c8c6f70fe38aa9265a5aa9ffb41d29ed8c05b832fd8ecfe34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kk/firefox-106.0.5.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "16fb0d6b793132af4ded6fdba8cc8f160aa111c3b8859676d3d693c64b0338f1"; + sha256 = "60a84aeaaaa4d27ccb491f0a9e9ae4e7d637581ae615718c31866c55642a3048"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/km/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/km/firefox-106.0.5.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "030e15c8a1b9826f6ad9f458ad00982bb0ea93ea1f5ad19e19efe207f928939a"; + sha256 = "cc5ba6588d3a88482e5b98854c54cc21e10ddc560e04f5f024746a74c265aa5e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/kn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/kn/firefox-106.0.5.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6ea17eed26aacddf3016a04e953c2fc20cb973275f70d37179966f3a4992253e"; + sha256 = "46ced27dbeeb58fa12831ac14cf5e89163d3eb578d0739cb8f2ea30f887ee984"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ko/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ko/firefox-106.0.5.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "57b9450a1a44ddbfaf1a2e0cd5dd701692d63c54258de6965a5b7e7a4f1ba34a"; + sha256 = "2c6cf5f50c697d73a51fd8a679344e1d7fbf36b64f01135eeba8a29150239641"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lij/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lij/firefox-106.0.5.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "ec69ee6dbb47af8ff3d91ac317fc7e6b4d94ee515fdfe0197a832f8960e9f201"; + sha256 = "8c58ad9fb77d22e7dd5b5e70686011dac7ccf34ac29fdacc0cf659d4fdec5b4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lt/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lt/firefox-106.0.5.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "56c0bdb64b493177e099555c591fc3379a9572f5a3b7f61d9c3fcf2d623c8a89"; + sha256 = "2aef1b4084884ae44be02a14461fa2dec2c81ce2ac377c5cee29f83a4c642dc0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/lv/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/lv/firefox-106.0.5.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "e06d195e2d8c3d3c319d7feb1ab68b947e89993efcfab50f0671e2fbab892ba2"; + sha256 = "87100833e89e26e457d96061a1e6de17ed094fd168c35373be603c7f6b63a168"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/mk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/mk/firefox-106.0.5.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "3bc69c36d17ec8c23c2036968ff90c5bc9eff671b178b2cadd5d0878d15334e4"; + sha256 = "722850038a48ed39fde1430b3a197275dfb7fd3ba24d2cff09c1301dbfbc025f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/mr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/mr/firefox-106.0.5.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "5ba8997b7bf593537d09e624bd90a753996bbc01134a82795d2564d3397c3a63"; + sha256 = "cafda0f1999c6a71c2c70b9006d8e8a88bfedf75348fac2e72b287731ccf27da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ms/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ms/firefox-106.0.5.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "17a860e0fafc415d1522ae046ca32dd63e9913f03da913bb720ec5178eb0824b"; + sha256 = "4998d8cd3a2ad8340f68159b5512d7b8088c62b2197b6cd3eccc46a6f6d229f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/my/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/my/firefox-106.0.5.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "17bd6b39e1c00755077488cd1081115d8766c71233df68613434577020550b3e"; + sha256 = "bea718582d932f5710d70f5127fbccc41e03598322801e7b59b5de1502eb8e6f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nb-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nb-NO/firefox-106.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e54acc8694b15c8b78c4f590ab47079eedc377f5c6256140e28757841416d180"; + sha256 = "65a685f7e693b73d270502fea7525887ee8d957c5a75744cbdc3fcd15157b6f2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ne-NP/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ne-NP/firefox-106.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3bc205b224f1d827488b8aef743a1ea339c05ac711bc0c921ab957561410b600"; + sha256 = "ebd9d437d1fcc0f3e8acc013d30697019558671041eb4206eea0012160ab8444"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nl/firefox-106.0.5.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "4fb99ce202b0671ffaa3abf78e683c2e687cab5a1081a34d1dbf93bfdc855185"; + sha256 = "5dde661ba63c77d616cf5909d1e52375ef218f449a3c431f0e93ada4332619bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/nn-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/nn-NO/firefox-106.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "340288ea958ccfe0af479094d23b01c0b88034d67c3d154613923eec23191392"; + sha256 = "0cd75e48327d416a090af8ab40592fc09ac763f0da4f48e86b4771c8d4daf695"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/oc/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/oc/firefox-106.0.5.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3da7ba90ebb55823868adf45d59d9c480d5ec3b1d91506c2f9ac265627c89d4d"; + sha256 = "1082e6a572755973d3e21699a00b857002e49354d9d5299646551aed7ea2c00f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pa-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pa-IN/firefox-106.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "708b1c2c33295d1fb9f6a852c4db85fa13da94f16050ab1fd1a8e1c4c99a7262"; + sha256 = "4f37ba01cc17921d9dfaf2f5f2f36a6c9692fd5cc3b4757613a60507a806a0f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pl/firefox-106.0.5.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "852995b094042e39dcb70876679d322a02b76595632682277b7dee45e5ae199d"; + sha256 = "9a70bd5d8c4ae48a169c4eae37eac264a05db863d977f6f3bdd325e8d22e7fc6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pt-BR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pt-BR/firefox-106.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "feb01adeb4bde5bf182c99fb381e0600a7bd6bb84e8c3266fa81f32fb710e8f0"; + sha256 = "e30f043eb18d23cf9f492b14dfb4517ac6c47cbc2a0de3e9fb0d8935a62a989d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/pt-PT/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/pt-PT/firefox-106.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4184e119c458df3200ba77030913f2a44a8f0845289c50511a18a8c48c3dc86d"; + sha256 = "211a29f69bce68bc7c72148bdb9d1d30a77960fc2dc3e114b21fb9f2c8170bdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/rm/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/rm/firefox-106.0.5.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "2243b8d915c687e14e230f518707f42519b0089dd87dc05c1004b3a5ada53f3a"; + sha256 = "e4567228921101a1e0dc66ed852c4616e1a68d74f71ac7a82584419fa5a62a1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ro/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ro/firefox-106.0.5.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e8f457a1bd2c913b45ecd509f7f2b47c3f72db11cf3e319d42593a032b17dce4"; + sha256 = "ffb85f77d6e4d6f21ea100b083e25dc6da56beb6e4c4c440042ec0eb6eff215b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ru/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ru/firefox-106.0.5.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "18452434a94044dfbc9cc9d8a7a5c2812a9b6f042d6f5e1cb711c3b9384a38dc"; + sha256 = "b93ae5d5ce9fc33167263ba02e7f6be8d00010a1c3436f93357ce3bd1c14f4f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sco/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sco/firefox-106.0.5.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "4f2dbb99229b5b77620ab4eace76603a60200755aacb32dd708903f59d973c73"; + sha256 = "dac6f947025d77b7591673c7de4a37129ede2be94bf2b62832b173b9e61eb160"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/si/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/si/firefox-106.0.5.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "034f5aa862f91682d1900fdfee6019bd6ab0f08e04112a8858be23cf5c76616c"; + sha256 = "62435eccd92098701aba6b9c142656d430324d4e4b999a677e70827968819a50"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sk/firefox-106.0.5.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5531cad398d274e8cdd4309754aecda44f5bad7c31262a86aad4c38dfb0a1333"; + sha256 = "d79809a87163157e3ee1f235ee4776166867e526770e2a87f2cddea02238233e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sl/firefox-106.0.5.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f7d89cd53186103d902e1bc5963bbb09107e6ce642adbc04d346255ac6a636d"; + sha256 = "3f3d8eb8cc92e723f379bb563a5b19e25c27349c1e2ed89cd1e0830e7c6237d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/son/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/son/firefox-106.0.5.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "98e0a9a93159f1db4baaeccd145e4e9519232664feb3492d61292c90884da8ff"; + sha256 = "45550ebc716d58456c879dca7d862699bf3c399a28c05578d17165934246c1c3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sq/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sq/firefox-106.0.5.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2052fa7872e80d020600af5c146516275d5f4566cedcb2ee547a13f5e73037df"; + sha256 = "0b0c3c345be57fba174cbe39a62d5490234aa27a52840d1e6c346ef569ce88f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sr/firefox-106.0.5.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b1401b7403aac0a6e9bcd5200646fea6694509639e1bc7d87d67d86e5f005220"; + sha256 = "da4281081e6a6a329708d79b1c1d6b9219fca578fe7129ef6b627ce8004061ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/sv-SE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/sv-SE/firefox-106.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "eb7889b5a3412945fcb1a5b75890a028e387c1e21a5aa5c7cb38f6c51c706c02"; + sha256 = "36aaf827ac63f4b5262cd23a66a4a6aae02fc27aab1702c4c5ee35cf44357dad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/szl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/szl/firefox-106.0.5.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "2079250dd3f66a5efb2b1b85362a04dfb45d835c72d9122ee80e0a7a1055bc7a"; + sha256 = "9c6c63d15e9a3d5030381c722bf8ea2302672ead978bd7fd4bae485faa247b29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ta/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ta/firefox-106.0.5.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "10e74f8e866ef435622c9e4e67a088e77d51c957afe250ae925497ec61202812"; + sha256 = "b7c2338fd9cfb1548d43205c7c30dc1251c1800338be6ea130503cb6154741fa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/te/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/te/firefox-106.0.5.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "1f077da289e7b76fa09dcc40d976992cb92893220e595a7103d5efe754cafe05"; + sha256 = "a1e307f56851f2d3a6e1ce8819f0df5684207c6c39593de6b584116ee678ae14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/th/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/th/firefox-106.0.5.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f127a65ca22e29d88940defa640f212e7cd804ab1700c94d9e2d413d1456e169"; + sha256 = "3059998f8b4ba27adbd67c072faf570dc1dd32264d7d4835d448e6e8540fbffa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/tl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/tl/firefox-106.0.5.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "5ae091d179b85af53a4a7ecaa0bb13d1fe9658bbc21fbc18a027f742b940a154"; + sha256 = "30fb920d75135f02b2e7cbb619114cc3eefbaf14ea4320dd389acb6043e1abb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/tr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/tr/firefox-106.0.5.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9c1551fe9c86d3fa044804657cfa80503bd28cc182b14bee83be4e529fe4d299"; + sha256 = "385db6ff23a0f3dc73103524fbea53ab3804cdc6dfe24eefaf6b6f4db20d136b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/trs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/trs/firefox-106.0.5.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "2a66bede6e02846c55207d5e556e0381da6ee7b39f5ee90d63a4535d49e5df3d"; + sha256 = "d5771fe381ee05d542fbcee2e5761488db446535b3001f834834292eb0a532e9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/uk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/uk/firefox-106.0.5.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c09d340c70e58ea1c1d95c76102056b474be0f14579fa39090df45de4d4e1911"; + sha256 = "098a8b55ce2d09c816df1b54ea61af72ef5d0073bb22434b2b7c7152affece5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/ur/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/ur/firefox-106.0.5.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "9bb8dd1d033c1839627e684835b101c6b0c1898ed91cea158f9840ae16344fc4"; + sha256 = "1741506b8043a98796370c1f89f88ae1d8c8ee7507dea303b97cdce5ea49c06e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/uz/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/uz/firefox-106.0.5.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "4dbf714bd6fd6a81fd93575f295b9468dee8ea6d1b15851bec52eaa23d825aaa"; + sha256 = "6e87d694c393a76b0e573f7251c2959870c898c1d99f9795ddf018b396af99ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/vi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/vi/firefox-106.0.5.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "bebd1b56a963c5fb6934b0feee2db4e4d7ac39c218ee71370f98280414715f40"; + sha256 = "eb8a0ba4e7ad891c8b2d6c0d86e927e09e3cda8af573bff9aabfec82e3f8e998"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/xh/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/xh/firefox-106.0.5.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "b65497a0b633789641d1794a0bcc96d77339a5b08c9adcf23a9ac05936f99d2b"; + sha256 = "28f3eba6d67e81f736a7c52f0021c52df373e8b11927c2a461b3d2a7e87a5d89"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/zh-CN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/zh-CN/firefox-106.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5308893259e84866e7a9085dbd9323eece94ee54fbe933dbed67163b1097145a"; + sha256 = "c6a3e2b2fda4fe0f5598c6ca0f3ee39d779035cdc80cbad69295a642807bf510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-x86_64/zh-TW/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-x86_64/zh-TW/firefox-106.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "a6da14bc65a44c5e082a8aca9b7adab4c40b43a6c341dc3e80cebad2bf5fa695"; + sha256 = "a13302de38a34a8b5324d4ed00dc618935d0b36fc8f373a8bcf37f31016722f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ach/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ach/firefox-106.0.5.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "c4973a0988bcd5459a8688a3b05ef4c59ec4926ef662c797950e395abfe5312f"; + sha256 = "bfac96b4a87e6947ee22f79db96856dc4fbbeff7cd0e4269b511fd4bacd4979f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/af/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/af/firefox-106.0.5.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "79eebc1e6f3172428ed685399b7502d90061f787a2b07336867cf482cec797ef"; + sha256 = "c37ca9ff65a6f2d5eb4d55bc4c4828252925dbace100291d9b521ab57d249be4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/an/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/an/firefox-106.0.5.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6a54f2b9c3ae8befbbb81948ece27312673021a00b7b23b7a6db9127d5354339"; + sha256 = "09d241887c11acc2b04505cdd6ba6c02cf437f3bd6d36c31e1dc301d46bd2e7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ar/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ar/firefox-106.0.5.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d46344c1a435135bb6bdf9c5b8676e71367c2024431eecfafd4d2d5fd0eae1bc"; + sha256 = "58fd1d348d1247377b666d568a8f13877c42438408de2ab300d4f4822dafecbc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ast/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ast/firefox-106.0.5.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "d35f5d34ac377724708496e32c1cbc82c9770eb4ca99804b55095d10c8e379d7"; + sha256 = "808c1f48d7412b78ae4f217b44a7e651d4437deb7c77a64a6e98d795c945b1b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/az/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/az/firefox-106.0.5.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "8e26a4f3070ad17d8ef9ea0a7eeed07f488a891bffae963f082fb932d90bac2f"; + sha256 = "16f0c6bc525f87bcd0b1f9102c65fc906908239e61b801d6eb9f9f1db50736ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/be/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/be/firefox-106.0.5.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "06315e7c19162f96b2a54115527167ae02c56c7f1797e952d268e6f6e1c27286"; + sha256 = "a3224744a782f7f84a04fd7883498d319530808da621b1bf6659decdc5d5a3bc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bg/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bg/firefox-106.0.5.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1d96aca3bae1dd7a725e6ca79018f3909a4008757cc16ad7b6ae897bd977e624"; + sha256 = "e42520df88204dcb3c0c3ecdbed5ed03ef1967a95537408728c128ba826b389f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bn/firefox-106.0.5.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c8cc8903f532568708217f8013b202b6204f6cbf9bf732cea5adbcfa3ebb5604"; + sha256 = "49dfe8bfdb2a5cb8228c343bc3b68cba9aea691915c77c545d99bd9d3a6b022d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/br/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/br/firefox-106.0.5.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "b7b8482c4c5408f278ee653096c673fcbddca8c441045de0f8f2193f2031bbea"; + sha256 = "cbfe771b3304934ccc4b888239f4d5ecf8785969e035c712aff097dce76cd541"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/bs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/bs/firefox-106.0.5.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "eb3f1adf762af8801e86e1f9d7e775248f7214bd8d448a64bd37c8efefdf4f5b"; + sha256 = "2d33748cb23d4173d69a91a7344843c824d81f01c89a8864e217145068c7b195"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ca-valencia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ca-valencia/firefox-106.0.5.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "dff88888fba09e6c5508a14d94594ff794aec8ba515078804346aa2fe9e31c8e"; + sha256 = "775ee17b32a98996e26d50065b80b093625c8f6ba09dda8cc859139b4588be8c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ca/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ca/firefox-106.0.5.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "050c9d662284471f8b6da31ad32ae0016bcb622d35ca96f4524abf603dce59bb"; + sha256 = "5b9c1ee42961ff98a1ab7d578f00cc5e12188f636accfe67429f4de059fdb33a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cak/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cak/firefox-106.0.5.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1a377cef57eaea6594a95fb56adc1cf8296073e27266f9e1e42bc7a37fa2817d"; + sha256 = "879809f89310e0c72e58d6305dd3757dc7a920c9d89f9c15981c23003a31a654"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cs/firefox-106.0.5.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "97a1d76274cf524068035d3864f1e304c964a82cc32cf62a5de29b276b7d7c61"; + sha256 = "7585d2ea180dfb8cf5da38b519cc9b7b3b5fb31c89f61f41cfa90ee2e8618ded"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/cy/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/cy/firefox-106.0.5.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "fea97ffa123a66631fb656cad681a18f68f9572a1b8c41f25ff7896ff2f83800"; + sha256 = "59241413efabb0741bd7ae5ce0d2503dd341df1d5799088991c643ef514082e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/da/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/da/firefox-106.0.5.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d275390ed892c69e3d3cbca26cfb4ddea2bc0a170475278c63d73df40183a894"; + sha256 = "8e6d239d086ed41eac2c5987bb11e5a14271745c83fabff5dd5959ae9750e804"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/de/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/de/firefox-106.0.5.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2b7effdc826a8f70bed63e76a0633761e8f1115bae5341c4a19946a3dda63e45"; + sha256 = "232532f2cd60388065c4c4d6135ae41838756fd8f81bc7d4900a4e37e23193a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/dsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/dsb/firefox-106.0.5.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "106ddd9bd6019b01ec736775dc6bd4d6f96170fb42a5730e14818acab40ebe9d"; + sha256 = "354fa6a668da8132ca504798e04878078368376a6ce9fcdd4bda894171b01072"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/el/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/el/firefox-106.0.5.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "fd78d309bc7533a9fdc303274d4a1f021dca67b9fbeacb7f1eb2a99a7dd00758"; + sha256 = "995c4b20371d5177f0d28f575f92765aaa6230ce03b8a7acce126a389b944ffd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-CA/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-CA/firefox-106.0.5.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "1cfd23d00c316923bd69a1e5b306b88d8993a35bfad5255785ad98880598d259"; + sha256 = "65c3280b54414efe93499297d5dac6df8ac1d64a841c8367749be942da7c2639"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-GB/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-GB/firefox-106.0.5.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7234cf1d21094d1040dc47567f7cb135e7e88b6a8ade06c056443899b1770aa2"; + sha256 = "b1eee7e9bcb93aaff519b18753e0b6b9bd24d8cab9b22b4abab9d4b272301411"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/en-US/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/en-US/firefox-106.0.5.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e9b45716fd2f6d40d6e94f25ec5b973f1c31700a0c6b5b7b5f7d8f22fe933d0f"; + sha256 = "4759a6edda9c05b23c134b74262c4beb5d754df73f900170c08deb9cd2bfb817"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/eo/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/eo/firefox-106.0.5.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "c4888b0636f96f95986bd0c128095f6195fce81672a220a520e7d11f0f3bcace"; + sha256 = "8a4c2f5c560a113ea57fa455fae0b098e949c6efb88b1a0fa3518ae7b6e8244d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-AR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-AR/firefox-106.0.5.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4e3c551924255eccfc37e35c83919cb22ab9c0b00eb7bac20aec3674f3b79069"; + sha256 = "7084b54973296664a7f78ee4866a3ecb5ee6da0c51c3a4820111dfee58ea74f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-CL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-CL/firefox-106.0.5.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "7a00e0b06d682b60440c94cd79faf9c53cf371aa86e8ae4308a701ffcb207705"; + sha256 = "550cb2cf9102645cec671e0d60887b1dc1421079774b0015b14633dd6380e158"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-ES/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-ES/firefox-106.0.5.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "87539b760616c22f3bbb5e983bfe51492d84f60f4778a7f4dff240eccf8257a9"; + sha256 = "829a0ee0f52602d5e630eb0e516f53650c8e28f77f8dfb24f1cd53c20836abec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/es-MX/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/es-MX/firefox-106.0.5.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "065996e24e6a2253a3a06e33b666b9106e2c60c42d37e6d8faf6c0f5d7cd33d2"; + sha256 = "a514a4f378f4c21669423af47661b5452f448003d02b0cc2db6a7a90221b7f85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/et/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/et/firefox-106.0.5.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9cd9cbd6b93116bd0df8d98b38b26672de34fb39c66eaa9abb1082f63e9e18a4"; + sha256 = "aabe2400efc673378b4548f7c7957dec6711822a26675f304bfc5232361abfd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/eu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/eu/firefox-106.0.5.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f336ec889a5fb57e4fe2a94511301cc688979caf54219e13d2dc95e238d23c59"; + sha256 = "32f394f2c21bae6b1102b2d6a0671bf1c08ea87e08e04b291f0aa64056a9cc64"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fa/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fa/firefox-106.0.5.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0624d7e83b41e5feb32aa5709fee95449e938ad953a922018ebc9cd8aaf82fb2"; + sha256 = "f6caf62aa656b11c2cc6a674e0d6d8c42823471b42f7fe63171fbdd338136c0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ff/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ff/firefox-106.0.5.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "35c244b150bb5f3f12b095f02b94838aeba5de4b4b19ab3c2b1895d792f5cda8"; + sha256 = "1804e43bc7d2b7f5b0741380728b5311feaec10bb397fc11028f4f0708196b4d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fi/firefox-106.0.5.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "2510bd28ca158d9ff51abac42dd3c2321afcd1d3951d8d72878241aafca5ff51"; + sha256 = "9fc3fefc74b639b9370513abfdbfdcc805f2435885a9a9dcb3e2073c4bde7aa9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fr/firefox-106.0.5.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a07d6c6ec4f1d5517faae488766e1efee7733d0c4069e4aa91682ec11848798c"; + sha256 = "a5491daf349b5e79b80cc6a3f69edcc18338c1fe1cfd962f3d3fd87d53c2b46c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/fy-NL/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/fy-NL/firefox-106.0.5.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "16d12c88d3a3668a38904fe4a6a2731fd3909d1b62ac5af58c0275677b4d492e"; + sha256 = "809b08b64e699e8ec8a11746215ecaa1a2682356796d0d18ef76a012a57e380c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ga-IE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ga-IE/firefox-106.0.5.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5e76da71a864bf8a894e1b615eeb6f66f8886487be7baee687a4581ddb20a573"; + sha256 = "febf0ec0fe7d75366709a5f6e214cf423a4e77e2af4864993c0fba6cd643a846"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gd/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gd/firefox-106.0.5.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "91983cd398c49881971a6972f6d20f599d752009300757712a093691f9778af0"; + sha256 = "0344ad234005e8cc7f1886203bbcf11de8739a9f4ce8f674b4c678a1d123acd2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gl/firefox-106.0.5.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "7336d539599c41d12b12c5ea353c65dc5e4c0259044a23b3b1822f7e6d1a1479"; + sha256 = "fea568adbd37c193919854a8244256838973ade7c251ef016c2bb457e894972e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gn/firefox-106.0.5.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "259f56c94a0eee5005aa7da7542d3297e6d205d7ff5c22f96b2a9f5302a71996"; + sha256 = "346bd8431e9ccc13e278e8563bf7b4feb49b6f2acb9469ef4194cfb5b551a618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/gu-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/gu-IN/firefox-106.0.5.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f78689869d21c2b6dcdc17abb3ac56bc59af2da75b4d6c8c0b838e799576651e"; + sha256 = "3be2979b35c373a2679c95b456edd3d0fa45f5e6cb645a747d97f05569c3fd16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/he/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/he/firefox-106.0.5.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "012e5f6faee74c3b9f643d4cf288bf0993088b62959eb6329a5588d7b8f3059f"; + sha256 = "85aebd4e130ff6fa61b71b69fa7b66822f119dccafbcf18c0589386b21b42970"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hi-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hi-IN/firefox-106.0.5.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "1755e7f66d3ce6a737dec1b79c54e03ccfe8897b6898830e42c1744e5cf0bc35"; + sha256 = "4e12c197575b21609842c6baa020eca1003e5455589c043e82ebc2fec3eb895d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hr/firefox-106.0.5.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "af48c9ef10f7f1f32b83547d361835b22b7668f323fd5ed16ef1615adc9e7b83"; + sha256 = "62fd48ba8c6533a19779dbc71b5d897c16db06c81f696d89f600f216ed47c1ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hsb/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hsb/firefox-106.0.5.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "301c5e4b5bb9815889b652cf609b7cff261fe488086cbb1c718f79456da3fc06"; + sha256 = "9d9f07fe6e75af945e3295c2af4d3253419adb07d26297ea0119f888010022f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hu/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hu/firefox-106.0.5.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "af1d857099344e7304bc7ff3b8bc51f8d1337730767c80f0db400a935b490c52"; + sha256 = "7169dced288547644979acba8f015c8fb5945283cdca4400b273a142c9407c46"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/hy-AM/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/hy-AM/firefox-106.0.5.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2569d8ef038ca29dc59a7f423921c1afcc60e3cbd882d7b061a4de6a1c189a16"; + sha256 = "46282b573d353699c65217fdcf907c614b5ee3ebec3f121f0e04aa52fb8813f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ia/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ia/firefox-106.0.5.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "8fb116fb83b55279df51caf2d5e4e2c0475ceae98c3a8f59a1c217a086dceee7"; + sha256 = "71274f5f6b4f243a718edbea6ceedf5658d90f562c6eed14a24af49a36ac95a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/id/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/id/firefox-106.0.5.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "37c973a9d2b2ffce6685ae652860bb384fb50570d3f4c22a2be600531a218d7d"; + sha256 = "3668a592dbeae0d8cdd42e46a1d6285220eb5d1c3b6c111d7f6082ecead61305"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/is/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/is/firefox-106.0.5.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "463814e5a96ca1f5a16f6206951dfb662784222260ccabc06fd9f212b1f26595"; + sha256 = "6345b38c7cb3e42c0f5ac9d2aef46a02d7b66d65720b3495c2837fea34708123"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/it/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/it/firefox-106.0.5.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "2c0cbc92ee66bbf5f0a922b427b0ed961574c606671e530c3d9f3b8e8d9dbe9e"; + sha256 = "e25d0251b309815992911d86bb004f77da5568911074e2949a25be4cbb41b0b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ja/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ja/firefox-106.0.5.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b31adfbc4f03f4cb0b0410c28a3eebb5f02f529cf7957bedb6ffaa6a079e22d7"; + sha256 = "f199e69573f9cbc3231ddeaef718a25b82a7deced96e8ce870ab2275110f7b1b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ka/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ka/firefox-106.0.5.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d0fd226ceb44ff4ba7e1817eabd653806a6343e8285d077743b3f76601d5ad2c"; + sha256 = "29ca54083f7f502e056c90bf0cf3d57259bbf3ac66555f085177c26f10055d09"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kab/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kab/firefox-106.0.5.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "dbd293017d716cb350b2739f21be00a998e6d34618f56b6ab63084c53d6482d0"; + sha256 = "96d259d3dda1ce3036f59ca85d2365d8d45d3fb12c479773b85200088d601c01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kk/firefox-106.0.5.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a6d7af17fd716eeb8be4668d77ab2116ef16a72be5fd594cd8eb182a4eb4652a"; + sha256 = "24cffb1f0bc5099dcd1d5214a34fb4f856148c9b33bde0eaedc2aa48baad4447"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/km/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/km/firefox-106.0.5.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "b45b85869ebd147f44fcb4b813afb32e91fe7831592e3dadbc55163b84593fec"; + sha256 = "6c0f331a80e9ed4689700dc2e007ff798d6196a3d48e146cdfbb58e1b04434f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/kn/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/kn/firefox-106.0.5.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "61bd032d859396416d48d7afa27dc51a1117b35605e265da4dc8cfc9f45afedd"; + sha256 = "3a9f55bbd8dc818093cd1565660d0a909accc35d3907ad269fe3dec7f5f45e92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ko/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ko/firefox-106.0.5.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "9b74f822a17c3ee9d4f787a3b6efdc7807adb02b9f8c26f997ae3fa828679b05"; + sha256 = "903a5aa70257444d06738954bd280a0f6ea233099163f157ac2089755f0d7605"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lij/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lij/firefox-106.0.5.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "04ef02e365eed5206e048696d55fa3df49db4f4374ee98dda422d7effd8fea15"; + sha256 = "090b75b861454023cbd3479e0e11b2b971e1eb3fe47690fe4774ac0cf8e8144e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lt/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lt/firefox-106.0.5.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a88c5e217d5bedb98a403aed894917cda97284ffdda676bff73b4b4682798eb5"; + sha256 = "90d200db253b2b4340dd2f766c20358c9c699350c5ac1946a5830dd5009d673b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/lv/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/lv/firefox-106.0.5.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9520b8f802bf500255f2e07e1faab1afadeafae2ec1ce57ab8c514a52b1055ff"; + sha256 = "adcc97bdfd9dde72c379ef8e4b9b4789e2daccba279fdb24342d8c2c2d2ff34f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/mk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/mk/firefox-106.0.5.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d1ca84ac561e7bf67089c180346fb71a1350bca2d5dbccb20c48f1d9667e76d1"; + sha256 = "989dfe2ed111ce4fb40b2ee4ca9ef07de210539690867d6a9f1bae64fd2e8b8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/mr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/mr/firefox-106.0.5.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "377b803e367b36e54bc7f2a720901745bfc36ae95583b3d43a8effb5ece6bb41"; + sha256 = "e12952b27f9f99aa0167ba08f6d00dda3c2dccb340e7968152e334f0eeb91472"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ms/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ms/firefox-106.0.5.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "69ba788924141600cb4e60e370798f426f44010eff6f44ccd3e615f2249adc61"; + sha256 = "e9c26689a5f0479561545a96d37a655a0edda532b78391794dc9cb8dda0d9b62"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/my/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/my/firefox-106.0.5.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "711dfe02b12428d508627b441b26e799458634bcaa2ce8f73b9a599fdd902e0b"; + sha256 = "3e3af776a1a53de30e6a568e76d549b9d161c95cc6f90e8513eed7c2513075b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nb-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nb-NO/firefox-106.0.5.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "791eaeb621160945c3a647529324f90ed8a6368379871d2ba1ab997228d2b210"; + sha256 = "3a4b0486dc04fcd81b810ea093e4b00f6ea1ce401055d4b263108e42365fec9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ne-NP/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ne-NP/firefox-106.0.5.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d668db53a74b92928a255c75e5f354039811c4a2cfbd79a12ea1e6543ccc6989"; + sha256 = "8e81a476091727a2449a6c9d357b2519a315c439f8b6cbe4e9f195b721e6833e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nl/firefox-106.0.5.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "0939f17542b3e51da5fee6ffb0bdf378bb9879bc8c6f5c73ff65c9df6c0c3e0f"; + sha256 = "80260fe98704a3b090c778090ffef82a67b3b24e0ec29753a7d9dc12e25b754c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/nn-NO/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/nn-NO/firefox-106.0.5.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b73cc2dec61c097680d4885b637a4c1ca50fec3ce970d5294ecf074e59907035"; + sha256 = "439db446f9554bb2e83b266fc5a9c3da9d55515c0c64447d2563d9f5ac4dd024"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/oc/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/oc/firefox-106.0.5.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "56c79712082f66611194ee25c1cc0ac6717813b86f148f6889a19b8f6bfab8a1"; + sha256 = "a5e4067bcfff97bab9d421a9b76d20ec10204dfe2fecf7e60cd303ba0ee9acfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pa-IN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pa-IN/firefox-106.0.5.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "23f31f719b3956e3e3288e483bcedec649cd7fdeb0d8e496ce9c6b8939a33d8d"; + sha256 = "1b55725007d2f68c209082c1655568bd7504b0d192928d55c5de3eb27a326005"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pl/firefox-106.0.5.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "5dc691eb6df81b457562d358f00f60024a58537a3c4e58f41b1e654c3454b7df"; + sha256 = "dcba4844632270e11f8f0b5c32d520df24befe17b17b8088a0e16f6ecf975177"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pt-BR/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pt-BR/firefox-106.0.5.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "c256f6fedbe65587ede43d1d6fcd30313dec63dc26cc8a14557dcea26d1c5c28"; + sha256 = "609e4decaf03a4c957cc04c71f60a9e049bfc9f4711d0d653e6df96b1579ffbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/pt-PT/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/pt-PT/firefox-106.0.5.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "4034810b68acd46f8b633ea660df39285d517aeab778cefdb449b295f70a76ce"; + sha256 = "527e946e3d769c831bb80663b0f0fe9677eed17f780c1c2cac9c48f72e1700ed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/rm/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/rm/firefox-106.0.5.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "31564251db55d332a79e2a669dded1e337415fbd61e38205fc4608e5f28a405d"; + sha256 = "509585050885537e89a9cc6435f52c9c88df487edae84001910fdace812515b8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ro/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ro/firefox-106.0.5.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "2909d9bdd4614f3e5a882e62242a189b1cd7c827764d8f8192423a2823d8ee2c"; + sha256 = "ce46f3974a3cf506d50c8fbf4b8a3e6dbfa3fd185ce1113665124dc966b71a54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ru/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ru/firefox-106.0.5.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b8d5f67a8f95f93807fb027de446485bbc48e6773118f0c5c29df2ae85da6ca5"; + sha256 = "2b52af61e9f87043bc07b5cbfcd0dfba82eab0e6e0b90c90e64985eca1167e1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sco/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sco/firefox-106.0.5.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "1733540d61c033062ab57379042ef3082d8605b8f2a57e71bdfe4cb0222a7f7b"; + sha256 = "f2dfb7cbda3434d2fa2696d1239bf25da10c1631dd2db97e4a24dc1cebb6a330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/si/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/si/firefox-106.0.5.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "12e6adeb13b207377a430b16091bb56a7883cde4be81200b6cfc3cb96a62c434"; + sha256 = "38cbee17384dc83b478a0372284a06ea0ff6dc5a743f1e4879317a86fd2ae2a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sk/firefox-106.0.5.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "8a8c0de4aef600f846c0ca1721297f8422e457855a9fd631c03746e8b6c3ffb3"; + sha256 = "3a8d0f81a7276dc780091f30a4f4ce3392c19b1c31ed77dc88527a48d1a69e8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sl/firefox-106.0.5.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "9ed77c83ec1a2ca6b01145ba763f2bec4000fd6c25ccdaa7ea1ced3267517b78"; + sha256 = "080bb30fe1587ae1f07f120657741ecc652a6a1d901c8c5ab6ae72f8ec4d8566"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/son/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/son/firefox-106.0.5.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "35c340200c1c8dd6c99d531d5ce32f713ea6e09b019a4a698017a9a2016e9a7d"; + sha256 = "d0b51c603b6966e90f278d7d008d1a78d4ec7ae46aabf59f8b2b6ef992c978e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sq/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sq/firefox-106.0.5.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "45123de3970bd6c27a649e393f122762b6e126d27b57606f69e1d796257249b1"; + sha256 = "cd8765fc2cf59814cd2dccbf01a90afca7f2221069922b9c312a012b370c836f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sr/firefox-106.0.5.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "76a2e56153b0a4831503b7f5cd87192a604d6f4f1007932aafcc06172b4a0b28"; + sha256 = "f9bb4b36b0d992a615e3a698307c0c94f5a2ec0c18af3bee1b7bd0ec735f40f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/sv-SE/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/sv-SE/firefox-106.0.5.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "c1ebc3b6a62c85d434dbdc268ca269473bc4e6d58de59410a5c81dfaf20f9e7b"; + sha256 = "5e9b2ab11da0435075ec345f011d236f5d6e5beb65af2d980184d280ad5c3e3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/szl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/szl/firefox-106.0.5.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "92e238e7f07fa630fcd10bfd7ca6bd33d3dd323e3a9f87122d6c0a41acb3dc98"; + sha256 = "88d22866fa2435e576be2ea405250d4fc11f88432c955c86b3271f32e24f70b0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ta/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ta/firefox-106.0.5.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b19e4e5fbb5882abacb89ff04b3e453c36cd0b29c6ccc80a83dc9f510a239511"; + sha256 = "bfb79595012034f7ac4ce2a1824792f259f2e4be259deb28f5b77409b63f722d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/te/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/te/firefox-106.0.5.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "74715e756eb306d627cf4e82400773597f1c17c9dd8dc502a2cb072753dc81a3"; + sha256 = "d6ebf6b4f3300ff7d4818935865c2dc15eb72f8181289d347e1272f700cc0aaf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/th/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/th/firefox-106.0.5.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "3e1f9fccfad05ea9487c960dcd1bb0fc4905c6e690b2b85ecf559593bf434421"; + sha256 = "2369419116f948fe8578a790539904e8cc801d1affe49f84689db4e0cc6a5996"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/tl/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/tl/firefox-106.0.5.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "c90a633917e84fbe05b0b8143acb1dfa2c749f7858f688d75284cfa4e6fd952f"; + sha256 = "e4708141e720ba6eb4843c7899592c66fad7f0ed55128c2c49d7ca7cc0f9a955"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/tr/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/tr/firefox-106.0.5.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fa08235eed535d66d0458b73e517d2ef1d87a6ec9adae7fd56747e1a8735ec91"; + sha256 = "b99642de344e5874ebd7450f3548815cf6795abcd5d19730f74b4573b1db4e81"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/trs/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/trs/firefox-106.0.5.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "dc6f90bc9ba03b518c9727c71eb18aac21a4f00b0bb2253f1c79d8c575b21b62"; + sha256 = "9bd307e5865afb53db7d960815430c1b5e692243047fac7be229f4935daf6e4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/uk/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/uk/firefox-106.0.5.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "4794dfd6b8fb4dd2c0ffd38d54e91f52a2038bd076fc3a7bd7bde802e673934b"; + sha256 = "0239d30b14fd7f31bcee7ece51501a465058cef308460498b62b35830672d89b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/ur/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/ur/firefox-106.0.5.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "089a373e5d0b857837fed9b2c784888feef06b40fde1ee8c31615efa12dc45a7"; + sha256 = "f9f0598bdae45ea0ddcee22da0ec647a3b212b6037c8072aff9255ce93a5931a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/uz/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/uz/firefox-106.0.5.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2c98e74eb3aa52ba1d3716708d374a18d11f2f4b011e3638d318c50b81b141ad"; + sha256 = "4b45396f564fbe1440ee3415c38268718023bc558afeffac49b097dfa83e2488"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/vi/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/vi/firefox-106.0.5.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "248bd09dba39dab6a3bc64fa0816e47300138d747e9904fbebbac04e87adb8b9"; + sha256 = "537d17dc4266752329091724aba644dffbcbc389dcb9dff368aba001c9ef9d3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/xh/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/xh/firefox-106.0.5.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "b9afa144d4643b238875528e1e213a1c17155f478e3d5c96dc2669879f58a1d7"; + sha256 = "869e3f149d37b09f1a9211585fca0b73e2c84f23465b64cbb26648df784fee30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/zh-CN/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/zh-CN/firefox-106.0.5.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "638ff37a0d9d552d1b363053f2a7fba76ca48cd2de50e61a919d2930d4e407db"; + sha256 = "dabaefdbea9e998b4cf5836a562630a7c075fd23eefa529c44232a06e6dc2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.3/linux-i686/zh-TW/firefox-106.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/106.0.5/linux-i686/zh-TW/firefox-106.0.5.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7555b126741878c18b32a6439e6d0eb5395e003ee0afa2b04b68be3ff9cd96dd"; + sha256 = "29625c22cd269d5e13a95c2d8939d76c3fa95708ae8c641e8998d4c159e61866"; } ]; } From 9c341e1ba305508553b9a277b66723081d256ef7 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 5 Nov 2022 00:16:56 -0400 Subject: [PATCH 150/223] erigon: init module --- nixos/modules/module-list.nix | 1 + .../services/blockchain/ethereum/erigon.nix | 105 ++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 nixos/modules/services/blockchain/ethereum/erigon.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fac882b41503..cffd73cd8b1f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -319,6 +319,7 @@ ./services/backup/zfs-replication.nix ./services/backup/znapzend.nix ./services/blockchain/ethereum/geth.nix + ./services/blockchain/ethereum/erigon.nix ./services/backup/zrepl.nix ./services/cluster/corosync/default.nix ./services/cluster/hadoop/default.nix diff --git a/nixos/modules/services/blockchain/ethereum/erigon.nix b/nixos/modules/services/blockchain/ethereum/erigon.nix new file mode 100644 index 000000000000..162774730976 --- /dev/null +++ b/nixos/modules/services/blockchain/ethereum/erigon.nix @@ -0,0 +1,105 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + + cfg = config.services.erigon; + + settingsFormat = pkgs.formats.toml { }; + configFile = settingsFormat.generate "config.toml" cfg.settings; +in { + + options = { + services.erigon = { + enable = mkEnableOption (lib.mdDoc "Ethereum implementation on the efficiency frontier"); + + settings = mkOption { + description = lib.mdDoc '' + Configuration for Erigon + Refer to for details on supported values. + ''; + + type = settingsFormat.type; + + example = { + datadir = "/var/lib/erigon"; + chain = "mainnet"; + http = true; + "http.port" = 8545; + "http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"]; + ws = true; + port = 30303; + "authrpc.port" = 8551; + "torrent.port" = 42069; + "private.api.addr" = "localhost:9090"; + "log.console.verbosity" = 3; # info + }; + + defaultText = literalExpression '' + { + datadir = "/var/lib/erigon"; + chain = "mainnet"; + http = true; + "http.port" = 8545; + "http.api" = ["eth" "debug" "net" "trace" "web3" "erigon"]; + ws = true; + port = 30303; + "authrpc.port" = 8551; + "torrent.port" = 42069; + "private.api.addr" = "localhost:9090"; + "log.console.verbosity" = 3; # info + } + ''; + }; + }; + }; + + config = mkIf cfg.enable { + # Default values are the same as in the binary, they are just written here for convenience. + services.erigon.settings = { + datadir = mkDefault "/var/lib/erigon"; + chain = mkDefault "mainnet"; + http = mkDefault true; + "http.port" = mkDefault 8545; + "http.api" = mkDefault ["eth" "debug" "net" "trace" "web3" "erigon"]; + ws = mkDefault true; + port = mkDefault 30303; + "authrpc.port" = mkDefault 8551; + "torrent.port" = mkDefault 42069; + "private.api.addr" = mkDefault "localhost:9090"; + "log.console.verbosity" = mkDefault 3; # info + }; + + systemd.services.erigon = { + description = "Erigon ethereum implemenntation"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + ExecStart = "${pkgs.erigon}/bin/erigon --config ${configFile}"; + Restart = "on-failure"; + StateDirectory = "erigon"; + CapabilityBoundingSet = ""; + DynamicUser = true; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectHome = true; + ProtectClock = true; + ProtectProc = "noaccess"; + ProcSubset = "pid"; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectHostname = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + RestrictNamespaces = true; + LockPersonality = true; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + }; + }; + }; +} From 9c85db3a3701135877142cbb64e8a0596131efa9 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 10 Oct 2022 11:52:00 -0400 Subject: [PATCH 151/223] handbrake: build against ffmpeg with custom patches The Handbrake project carries a set of ffmpeg patches required for things like proper subtitle timing. See: https://github.com/HandBrake/HandBrake/issues/4029 --- pkgs/applications/video/handbrake/default.nix | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index ee146127a38f..7c06f6ddb859 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -93,6 +93,51 @@ let sha256 = "1kk11zl1mk37d4cvbc75gfndmma7vy3vkp4gmkyl92kiz6zadhyy"; }; + # Handbrake maintains a set of ffmpeg patches. In particular, these + # patches are required for subtitle timing to work correctly. See: + # https://github.com/HandBrake/HandBrake/issues/4029 + ffmpeg-version = "4.4.1"; + ffmpeg-hb = ffmpeg-full.overrideAttrs (old: { + version = ffmpeg-version; + src = fetchurl { + url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2"; + hash = "sha256-j8nyCsXtlRFanihWR63Q7t1cwamKA5raFMEyRS+YrEI="; + }; + patches = old.patches or [] ++ [ + "${src}/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch" + "${src}/contrib/ffmpeg/A02-qsv-interpolation.patch" + "${src}/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch" + "${src}/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch" + "${src}/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch" + "${src}/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch" + "${src}/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch" + "${src}/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch" + "${src}/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch" + "${src}/contrib/ffmpeg/A12-qsv-opaque-vpp.patch" + "${src}/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch" + "${src}/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch" + "${src}/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch" + "${src}/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch" + "${src}/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch" + "${src}/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch" + "${src}/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch" + "${src}/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch" + "${src}/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch" + "${src}/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch" + ]; + }); + versionFile = writeText "version.txt" '' BRANCH=${versions.majorMinor version}.x DATE=1970-01-01 00:00:01 +0000 @@ -152,7 +197,7 @@ let self = stdenv.mkDerivation rec { buildInputs = [ a52dec dav1d - ffmpeg-full + ffmpeg-hb fontconfig freetype fribidi From 3d6b83c97359cf8888b16a75a802cafef0c55012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 11:06:45 +0000 Subject: [PATCH 152/223] bazelisk: 1.14.0 -> 1.15.0 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5c5e7c2d530b..fd8a78a1ac6b 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg="; + sha256 = "sha256-+JAAei783S9umDSMSQq50ovYm1MCID33W6dolTxBEvU="; }; vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; From b4fef779596b9f04135038f9ff5b21bd5009650e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 11:24:32 +0000 Subject: [PATCH 153/223] cargo-release: 0.22.2 -> 0.23.0 --- pkgs/development/tools/rust/cargo-release/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index 2919d34b2573..476635ad305d 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.22.2"; + version = "0.23.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-G235QKwwOFnHsfU26hc7d0mD/nwGyJRPs6BCctEqxJ8="; + sha256 = "sha256-11u6y4w7Ah4SNgfNeVpanIZ5bWz1K0TkMGCxDtomKMM="; }; - cargoSha256 = "sha256-A3tzgLW+/GO4/kHRJH7Y7vtFUzI2Ow0nyfMfIuI5Sl4="; + cargoSha256 = "sha256-oXTuLWH8nSH1XZ+Zwu2jEi3yY+0SeR+N/b0s5gKVORQ="; nativeBuildInputs = [ pkg-config ]; From 4eb6de16edcd5000cb044a70b1f4d9609ac09169 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 11:33:03 +0000 Subject: [PATCH 154/223] clair: 4.4.4 -> 4.5.0 --- pkgs/tools/admin/clair/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index fcf2b72a1422..65b8d75746e0 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "clair"; - version = "4.4.4"; + version = "4.5.0"; src = fetchFromGitHub { owner = "quay"; repo = pname; rev = "v${version}"; - hash = "sha256-QfNFms1OxKPk6vimagMFGWJSl9L7JEM1rIK5kNpZlfg="; + hash = "sha256-/Czgdl6OxfXSQGvoanA8eoGdzK/wCgGH3wy5aLf0DSM="; }; - vendorSha256 = "sha256-Y3eymnLVbDmisV3RDAYkV+I6kTe/CoG0yLvZBOrTfig="; + vendorSha256 = "sha256-XWsnEjVA/fqiLevn6sxjzlDfuy937idIcXdTY56FrdA="; nativeBuildInputs = [ makeWrapper From 3628ad0a9e7caf6b1c5a0f5cbadfa4b71936afd1 Mon Sep 17 00:00:00 2001 From: Robert Obryk Date: Sat, 5 Nov 2022 12:38:11 +0100 Subject: [PATCH 155/223] nixos/security/wrappers: add test This is a small smoke test of each piece (setuid, setgid, caps) of wrappers' functionality. It doesn't try to check for combinations of functionalities or anything more complicated. --- nixos/tests/all-tests.nix | 1 + nixos/tests/wrappers.nix | 79 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 nixos/tests/wrappers.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cb3b9a248c0e..380f1a7d27e2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -691,6 +691,7 @@ in { wmderland = handleTest ./wmderland.nix {}; wpa_supplicant = handleTest ./wpa_supplicant.nix {}; wordpress = handleTest ./wordpress.nix {}; + wrappers = handleTest ./wrappers.nix {}; writefreely = handleTest ./web-apps/writefreely.nix {}; xandikos = handleTest ./xandikos.nix {}; xautolock = handleTest ./xautolock.nix {}; diff --git a/nixos/tests/wrappers.nix b/nixos/tests/wrappers.nix new file mode 100644 index 000000000000..08c1ad0b6b99 --- /dev/null +++ b/nixos/tests/wrappers.nix @@ -0,0 +1,79 @@ +import ./make-test-python.nix ({ pkgs, ... }: +let + userUid = 1000; + usersGid = 100; + busybox = pkgs : pkgs.busybox.override { + # Without this, the busybox binary drops euid to ruid for most applets, including id. + # See https://bugs.busybox.net/show_bug.cgi?id=15101 + extraConfig = "CONFIG_FEATURE_SUID n"; + }; +in +{ + name = "wrappers"; + + nodes.machine = { config, pkgs, ... }: { + ids.gids.users = usersGid; + + users.users = { + regular = { + uid = userUid; + isNormalUser = true; + }; + }; + + security.wrappers = { + suidRoot = { + owner = "root"; + group = "root"; + setuid = true; + source = "${busybox pkgs}/bin/busybox"; + program = "suid_root_busybox"; + }; + sgidRoot = { + owner = "root"; + group = "root"; + setgid = true; + source = "${busybox pkgs}/bin/busybox"; + program = "sgid_root_busybox"; + }; + withChown = { + owner = "root"; + group = "root"; + source = "${pkgs.libcap}/bin/capsh"; + program = "capsh_with_chown"; + capabilities = "cap_chown+ep"; + }; + }; + }; + + testScript = + '' + def cmd_as_regular(cmd): + return "su -l regular -c '{0}'".format(cmd) + + def test_as_regular(cmd, expected): + out = machine.succeed(cmd_as_regular(cmd)).strip() + assert out == expected, "Expected {0} to output {1}, but got {2}".format(cmd, expected, out) + + test_as_regular('${busybox pkgs}/bin/busybox id -u', '${toString userUid}') + test_as_regular('${busybox pkgs}/bin/busybox id -ru', '${toString userUid}') + test_as_regular('${busybox pkgs}/bin/busybox id -g', '${toString usersGid}') + test_as_regular('${busybox pkgs}/bin/busybox id -rg', '${toString usersGid}') + + test_as_regular('/run/wrappers/bin/suid_root_busybox id -u', '0') + test_as_regular('/run/wrappers/bin/suid_root_busybox id -ru', '${toString userUid}') + test_as_regular('/run/wrappers/bin/suid_root_busybox id -g', '${toString usersGid}') + test_as_regular('/run/wrappers/bin/suid_root_busybox id -rg', '${toString usersGid}') + + test_as_regular('/run/wrappers/bin/sgid_root_busybox id -u', '${toString userUid}') + test_as_regular('/run/wrappers/bin/sgid_root_busybox id -ru', '${toString userUid}') + test_as_regular('/run/wrappers/bin/sgid_root_busybox id -g', '0') + test_as_regular('/run/wrappers/bin/sgid_root_busybox id -rg', '${toString usersGid}') + + # We are only testing the permitted set, because it's easiest to look at with capsh. + machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_CHOWN')) + machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_SYS_ADMIN')) + machine.succeed(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_CHOWN')) + machine.fail(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_SYS_ADMIN')) + ''; +}) From 1bd99d9268a3497997e5d3e7c608890ec874a536 Mon Sep 17 00:00:00 2001 From: c4710n Date: Sat, 5 Nov 2022 19:54:00 +0800 Subject: [PATCH 156/223] tree-sitter-grammars: add eex --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../parsing/tree-sitter/grammars/tree-sitter-eex.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 5b3862082d8f..b3e325ffc9a6 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -17,6 +17,7 @@ tree-sitter-devicetree = lib.importJSON ./tree-sitter-devicetree.json; tree-sitter-dockerfile = lib.importJSON ./tree-sitter-dockerfile.json; tree-sitter-dot = lib.importJSON ./tree-sitter-dot.json; + tree-sitter-eex = lib.importJSON ./tree-sitter-eex.json; tree-sitter-elisp = lib.importJSON ./tree-sitter-elisp.json; tree-sitter-elixir = lib.importJSON ./tree-sitter-elixir.json; tree-sitter-elm = lib.importJSON ./tree-sitter-elm.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json new file mode 100644 index 000000000000..0bfb77c762fc --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/connorlay/tree-sitter-eex", + "rev": "f742f2fe327463335e8671a87c0b9b396905d1d1", + "date": "2022-01-12T10:01:23-08:00", + "path": "/nix/store/an5vj0gnziy44ckklm9hxp9wbydisk4l-tree-sitter-eex", + "sha256": "19n07ywavwkh4p189d18wxhch45qgn094b7mkdymh60zr7cbmyjh", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index ad62530ee31d..63f749c890b4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -224,6 +224,10 @@ let orga = "connorlay"; repo = "tree-sitter-surface"; }; + "tree-sitter-eex" = { + orga = "connorlay"; + repo = "tree-sitter-eex"; + }; "tree-sitter-heex" = { orga = "connorlay"; repo = "tree-sitter-heex"; From a0b7b60364db219d127fcb7151487d569563567f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 12:15:20 +0000 Subject: [PATCH 157/223] ctlptl: 0.8.11 -> 0.8.12 --- pkgs/development/tools/ctlptl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 3238682eb007..bf49c850881b 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-69xFfDNitLu8KUQP9ij0ndV6JCzp9wrLsHKwEjuhYdY="; + sha256 = "sha256-h0JR641+VBiTJY8INXhxwvsyZGLH4YRdkddwo2IUDQk="; }; vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; From 2d4340c2b7ff626878f19657b605921af5162768 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 4 Nov 2022 23:35:51 +0100 Subject: [PATCH 158/223] python3Packages.bsblan: remove in favor of python-bsblan Duplicate with the correct name introduced in #197857. --- .../python-modules/bsblan/default.nix | 69 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/development/python-modules/bsblan/default.nix diff --git a/pkgs/development/python-modules/bsblan/default.nix b/pkgs/development/python-modules/bsblan/default.nix deleted file mode 100644 index 9f35da172596..000000000000 --- a/pkgs/development/python-modules/bsblan/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ lib -, aiohttp -, aresponses -, buildPythonPackage -, fetchFromGitHub -, mypy -, packaging -, poetry-core -, pydantic -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, setuptools -, yarl -}: - -buildPythonPackage rec { - pname = "bsblan"; - version = "0.5.6"; - format = "pyproject"; - - disabled = pythonOlder "3.9"; - - src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "refs/tags/v${version}"; - hash = "sha256-eTKexiuomlTryy2bD2w9Pzhb4R9C3OIbLNX+7h/5l+c="; - }; - - nativeBuildInputs = [ - poetry-core - setuptools - ]; - - propagatedBuildInputs = [ - aiohttp - packaging - pydantic - yarl - ]; - - checkInputs = [ - aresponses - mypy - pytest-asyncio - pytest-mock - pytestCheckHook - ]; - - postPatch = '' - # Upstream doesn't set a version for the pyproject.toml - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace "--cov" "" - ''; - - pythonImportsCheck = [ - "bsblan" - ]; - - meta = with lib; { - description = "Python client for BSB-Lan"; - homepage = "https://github.com/liudger/python-bsblan"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 77088aa1bef2..8a33d02ba1a3 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -41,6 +41,7 @@ mapAliases ({ Babel = babel; # added 2022-05-06 bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15 blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29 + bsblan = python-bsblan; # added 2022-11-04 bt_proximity = bt-proximity; # added 2021-07-02 carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18 class-registry = phx-class-registry; # added 2021-10-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8f75d7ed61b2..f7a6becb23a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1394,8 +1394,6 @@ self: super: with self; { bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - bsblan = callPackage ../development/python-modules/bsblan { }; - bson = callPackage ../development/python-modules/bson { }; bsuite = callPackage ../development/python-modules/bsuite { }; From 482ea02ea0c356254f121c48f9349c4c59e3fc96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 23:55:48 +0200 Subject: [PATCH 159/223] python310Packages.aiohomekit: 2.0.2 -> 2.2.14 Co-Authored-By: Martin Weinelt --- pkgs/development/python-modules/aiohomekit/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 4d0edf652085..794879d4b472 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -3,6 +3,7 @@ , aiocoap , bleak , bleak-retry-connector +, chacha20poly1305 , chacha20poly1305-reuseable , commentjson , cryptography @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "2.0.2"; + version = "2.2.14"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +27,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pZEZHhsU/1tEX1VOFQ8b+ERJ8tU1pzRJMRYD28nfTb0="; + hash = "sha256-0O8fax25vabItFnUD9N7C4gyMSKPHqHSgzJXJjp5dGw="; }; nativeBuildInputs = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { aiocoap bleak bleak-retry-connector + chacha20poly1305 chacha20poly1305-reuseable commentjson cryptography From 8d7cec09c3166ac5be69baa398123794a3846f7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:03:55 +0200 Subject: [PATCH 160/223] python310Packages.bleak: 0.18.1 -> 0.19.1 --- pkgs/development/python-modules/bleak/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 81dd818e227b..ed21f046eae4 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -5,6 +5,7 @@ , dbus-fast , fetchFromGitHub , poetry-core +, pytest-asyncio , pytestCheckHook , pythonOlder , typing-extensions @@ -12,16 +13,16 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.18.1"; + version = "0.19.1"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2/jJ2C2TudwCAshDBLUQjNMbYa2j4XfW8bXmeWrAyrA="; + hash = "sha256-WNFAN8xE0ULo4fQnPFJJsc/HtrVo1ClxsvxrrhJjvI0="; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pytest-asyncio pytestCheckHook ]; From 677f3cdeabcb79a4c3887f5daa9cf8f0afed4cc8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:05:26 +0200 Subject: [PATCH 161/223] python310Packages.bleak-retry-connector: 2.1.3 -> 2.8.2 --- .../python-modules/bleak-retry-connector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix index 2e167add9b9f..26fe4d62feb4 100644 --- a/pkgs/development/python-modules/bleak-retry-connector/default.nix +++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bleak-retry-connector"; - version = "2.1.3"; + version = "2.8.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-fEdyo6QBmHWgl5o/ZIu/HM8GWp5t88awhb+7SPWngf0="; + hash = "sha256-u/7gEY1HsOc2JqGmq/kS46wcA0p8B7D08vrOHWIuFyY="; }; postPatch = '' From 85bd60c7cb1226ea0b07cc0fd408421095b187d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Oct 2022 09:42:03 +0200 Subject: [PATCH 162/223] python310Packages.bthome-ble: 1.2.2 -> 2.1.0 --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 5f82f2a1852f..9f0014c16feb 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "1.2.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-2/2ODlHqQOl4LHUb2fyQpmsBYnoz0Rvc9lLEfZTKijA="; + hash = "sha256-4vk9uaG/9n3lNEWAergW9kFN2/Ta/KSax0rK9tVxAfw="; }; nativeBuildInputs = [ From 3c783987b8b8b578b0fcf76fc9598ca9f0ebca17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Oct 2022 19:07:48 +0200 Subject: [PATCH 163/223] python310Packages.bluetooth-data-tools: 0.1.2 -> 0.2.0 --- .../python-modules/bluetooth-data-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index 8744adc57555..7a17d84a666c 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.1.2"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA="; + hash = "sha256-5FOFN2B35dTYuZhO09HZ/sNkY5X16bICP+qWzmrua5o="; }; nativeBuildInputs = [ From cec0949d405e143e0dfb5a38076d81420c2e0371 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:09:29 +0200 Subject: [PATCH 164/223] python310Packages.dbus-fast: 1.29.1 -> 1.64.0 --- .../development/python-modules/dbus-fast/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 72cb7b7ee9c7..3fabcd6a1135 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.29.1"; + version = "1.64.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GqL6PZlqFi5Es8VYeqeTsXX6j5fol2JzcosFtVCQn60="; + hash = "sha256-y/H4TYCicn6Gvv+F4ogqhNWK2mZxEVNGCY4pJAfjq9s="; }; nativeBuildInputs = [ @@ -78,6 +78,14 @@ buildPythonPackage rec { "test_standard_interfaces" "test_tcp_connection_with_forwarding" "test_unexpected_disconnect" + # NameError: name '_cast_uint32_native' is not defined + "test_unmarshall_bluez_interfaces_added_message" + "test_unmarshall_bluez_interfaces_removed_message" + "test_unmarshall_bluez_message" + "test_unmarshall_bluez_properties_changed_with_service_data" + "test_unmarshall_can_resume" + "test_unmarshalling_with_table" + "test_ay_buffer" ]; meta = with lib; { From e1cbc3f8a2e00d43ae8823238e78d89adb8f7ad7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:04:29 +0200 Subject: [PATCH 165/223] python310Packages.fjaraskupan: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/fjaraskupan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fjaraskupan/default.nix b/pkgs/development/python-modules/fjaraskupan/default.nix index 3c4478a8007b..bad4d7f14ef0 100644 --- a/pkgs/development/python-modules/fjaraskupan/default.nix +++ b/pkgs/development/python-modules/fjaraskupan/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fjaraskupan"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "elupus"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Vt2THMB4m0YCLdfEnAokwS0oJfcgp3fmZMUDhTrekZY="; + hash = "sha256-0tNLwYckWF9GjhniEkiO+A+xDsUriUsMFZxG/FmUfps="; }; propagatedBuildInputs = [ From be8ee7e2275b6e991a2f74a45cb325b66604bfd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 21:58:46 +0200 Subject: [PATCH 166/223] python310Packages.home-assistant-bluetooth: 1.5.1 -> 1.6.0 --- .../python-modules/home-assistant-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 631e0b6eaad3..4b0a9b660cfb 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.5.1"; + version = "1.6.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY="; + hash = "sha256-6w940Yn0WgVC0Rn9OX40+6hO4maPSC7VrT3ARD8CIjQ="; }; postPatch = '' From c2687f97958d07e9dfb655b33d180e74c5bc34f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:06:32 +0200 Subject: [PATCH 167/223] python310Packages.led-ble: 0.10.1 -> 1.0.0 --- pkgs/development/python-modules/led-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index 92f397a4c517..810a9d59c02c 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "0.10.1"; + version = "1.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-GyVj9g4tqPaR5Gd8N76TtkldaAATnEBsSs/F+2iQqGM="; + hash = "sha256-XAb/tJPUe/sNvcU7t63inMPBIz+AREioWXBuQa/c9T0="; }; postPatch = '' From 0917dd484eb2d93ecdb10da60cdebaf1e9579120 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 10:59:16 +0200 Subject: [PATCH 168/223] python310Packages.oralb-ble: init at 0.10.1 --- .../python-modules/oralb-ble/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/oralb-ble/default.nix diff --git a/pkgs/development/python-modules/oralb-ble/default.nix b/pkgs/development/python-modules/oralb-ble/default.nix new file mode 100644 index 000000000000..8905529f6dec --- /dev/null +++ b/pkgs/development/python-modules/oralb-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-data-tools +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "oralb-ble"; + version = "0.10.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Iuu44H8fCbJysoSJLBtlJ1XE5Ad2caWihj3UZytWK3o="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-data-tools + bluetooth-sensor-state-data + home-assistant-bluetooth + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=oralb_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "oralb_ble" + ]; + + meta = with lib; { + description = "Library for Oral B BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/oralb-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7a6becb23a1..9ea30fb92d97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6486,6 +6486,8 @@ self: super: with self; { opuslib = callPackage ../development/python-modules/opuslib { }; + oralb-ble = callPackage ../development/python-modules/oralb-ble { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; ordered-set = callPackage ../development/python-modules/ordered-set { }; From 3c7db59478e0ec575e4bd1c4ecaeab1ad7be2a1e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:07:25 +0200 Subject: [PATCH 169/223] python310Packages.pyswitchbot: 0.19.15 -> 0.20.2 --- pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix index ec7758f664b8..6ba4edcde88c 100644 --- a/pkgs/development/python-modules/pyswitchbot/default.nix +++ b/pkgs/development/python-modules/pyswitchbot/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyswitchbot"; - version = "0.19.15"; + version = "0.20.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pySwitchbot"; rev = "refs/tags/${version}"; - hash = "sha256-iWd67JEnlI60mvd5hhMPRooZ3VECTt+M9UFvXWdJVPg="; + hash = "sha256-GNjyDkqhOP9sq2qoAZCdSrUNte3FynVxhy9RSUn9j/c="; }; propagatedBuildInputs = [ From d4cc3aba2edb2479afe81db8f2402ee13c1a6a1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Nov 2022 23:34:55 +0100 Subject: [PATCH 170/223] python310Packages.sensor-state-data: 2.9.1 -> 2.10.1 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index ea26d5b86f21..20bd058fdf5a 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.9.1"; + version = "2.10.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bBLBDdwVUCh8VA/6w/5DmJNvayaWHNIe1kRhnOQ2Llc="; + hash = "sha256-pCo9CMX+CQBFuK5rbMHsxQEdBHvp1EZA7A9Ykm68NCw="; }; nativeBuildInputs = [ From 619ffc8cb0ae1c46d324c914f23ae7d46312efd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Oct 2022 09:08:38 +0200 Subject: [PATCH 171/223] python310Packages.yalexs-ble: 1.9.2 -> 1.9.5 --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 67bbdc965b51..084feb2e6ca4 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "1.9.2"; + version = "1.9.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - hash = "sha256-ypZ0VDGgQcwlMS1POW+lvTlmd02P7bPR2Qo0lDyBYUw="; + hash = "sha256-cU4aeJlRBwxQm6a/rqpO2HVZfz/vfEo4P5x+BjKqqeo="; }; nativeBuildInputs = [ From 4153fd3444089f9837f9345956080c595b49c3ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Oct 2022 10:37:37 +0200 Subject: [PATCH 172/223] python310Packages.aiopyarr: 22.9.0 -> 22.10.0 --- pkgs/development/python-modules/aiopyarr/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiopyarr/default.nix b/pkgs/development/python-modules/aiopyarr/default.nix index e9dec57f4d18..eba27f0390ad 100644 --- a/pkgs/development/python-modules/aiopyarr/default.nix +++ b/pkgs/development/python-modules/aiopyarr/default.nix @@ -2,7 +2,9 @@ , aiohttp , aresponses , buildPythonPackage +, ciso8601 , fetchFromGitHub +, orjson , pytest-asyncio , pytestCheckHook , pythonOlder @@ -10,7 +12,7 @@ buildPythonPackage rec { pname = "aiopyarr"; - version = "22.9.0"; + version = "22.10.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,11 +21,13 @@ buildPythonPackage rec { owner = "tkdrob"; repo = pname; rev = version; - hash = "sha256-nJjqpk4GcgXJhFZd4E3vSmyNP+RkOASEd4Ipemx6cAc="; + hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88="; }; propagatedBuildInputs = [ aiohttp + ciso8601 + orjson ]; checkInputs = [ From a3109223f306dd7c9b876913209bbba8b5ee25ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 10:31:02 +0000 Subject: [PATCH 173/223] python310Packages.aioshelly: 3.0.0 -> 4.1.2 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index a3dfa62705a5..c4881dcdd56f 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "3.0.0"; + version = "4.1.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; + hash = "sha256-0BxbcWA2Kdk1xTSKN/dH9LJc3yI60kmyMCrK77tqyNE="; }; propagatedBuildInputs = [ From 80f87533206b54d4b8c7c864cd0b9927ba0982ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Oct 2022 18:55:40 +0000 Subject: [PATCH 174/223] python310Packages.aiounifi: 40 -> 41 --- pkgs/development/python-modules/aiounifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 38b84ddf5729..b75b9ac31810 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "40"; + version = "41"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PJ3AIoqu0cUs8IZqY9O2e+GuPd4vjLn9VruKyPxVe4A="; + hash = "sha256-rBluo4080m9jFnquXaQY/Cntp7wHToY16aNFhzrQJs8="; }; propagatedBuildInputs = [ From 71663ee8565be81be5345ba21701da66eb12a7d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Oct 2022 18:02:17 +0000 Subject: [PATCH 175/223] python310Packages.freebox-api: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/freebox-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/freebox-api/default.nix b/pkgs/development/python-modules/freebox-api/default.nix index a04dada07dcc..76fd69bd0223 100644 --- a/pkgs/development/python-modules/freebox-api/default.nix +++ b/pkgs/development/python-modules/freebox-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "freebox-api"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hacf-fr"; repo = pname; - rev = "v${version}"; - hash = "sha256-y78PzSivB+IJ9hrN3ZRhDBo7kI7M6uleTPkF6slO6So="; + rev = "refs/tags/v${version}"; + hash = "sha256-60hIv35nNxXPFZy/JvG1O/ZkSMk65XDojUYP1QyfwXY="; }; nativeBuildInputs = [ From b342a3d291eea516ccb8b5dec8034011f50ddfec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 4 Nov 2022 01:24:57 +0100 Subject: [PATCH 176/223] python310Packages.gcal-sync: 2.1.0 -> 3.0.0 --- .../python-modules/gcal-sync/default.nix | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/gcal-sync/default.nix b/pkgs/development/python-modules/gcal-sync/default.nix index 85b536b836db..e9afe6ef1b49 100644 --- a/pkgs/development/python-modules/gcal-sync/default.nix +++ b/pkgs/development/python-modules/gcal-sync/default.nix @@ -1,18 +1,20 @@ { lib -, buildPythonPackage -, pythonOlder -, fetchFromGitHub , aiohttp -, pydantic +, buildPythonPackage +, fetchFromGitHub , freezegun +, ical +, pydantic , pytest-aiohttp , pytest-asyncio , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "gcal-sync"; - version = "2.1.0"; + version = "3.0.0"; + format = "setuptools"; disabled = pythonOlder "3.9"; @@ -20,11 +22,12 @@ buildPythonPackage rec { owner = "allenporter"; repo = "gcal_sync"; rev = "refs/tags/${version}"; - hash = "sha256-FKrZPiN4rSk5iFhGAXVuKhEeekOnPxdFslP4SMUrQIE="; + hash = "sha256-xRmNV06gMdPPHcvgJTvxPZBUi1BbFTnwZpzXLBluBYo="; }; propagatedBuildInputs = [ aiohttp + ical pydantic ]; @@ -35,12 +38,15 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ "gcal_sync" ]; + pythonImportsCheck = [ + "gcal_sync" + ]; - meta = { - description = "Python library for syncing Google Calendar to local storage"; + meta = with lib; { + description = "Library for syncing Google Calendar to local storage"; homepage = "https://github.com/allenporter/gcal_sync"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ dotlambda ]; + changelog = "https://github.com/allenporter/gcal_sync/releases/tag/${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ dotlambda ]; }; } From 31dcf3282fc2ef463001e567f7744f1bf55e042d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 30 Oct 2022 23:23:28 +0100 Subject: [PATCH 177/223] python310Packages.pyatmo: 7.2.0 -> 7.3.0 --- pkgs/development/python-modules/pyatmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5a570464abf2..afa5f0c378b1 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "7.2.0"; + version = "7.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jabesq"; repo = "pyatmo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-5RlYTgxWm6BM/V2+1IF/rje5dNirN7PJs0eSiYeOpOQ="; + sha256 = "sha256-3NgAsXMdt4FsE30oxeTfunpP2e+iqLFZkhMJbc5jVGw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 852d12c567be8583d9e276b84d604637b3ff6569 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Oct 2022 19:27:25 +0200 Subject: [PATCH 178/223] python310Packages.pydaikin: 2.7.2 -> 2.8.0 --- pkgs/development/python-modules/pydaikin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 66608d7783cc..ba6612bbde47 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.7.2"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mustang51"; repo = pname; rev = "v${version}"; - hash = "sha256-IONmzrCW/5nAEa7GlWMZsnweQWTSUwV4HwhXww6/9ig="; + hash = "sha256-AZDwoq4lCThzwHI0WCzrV9Il2MHp0LKxWg/dscGw0q0="; }; propagatedBuildInputs = [ From 5e9e8a21d99550c8f2533fbe150b497d1f3aae16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Oct 2022 16:15:29 +0000 Subject: [PATCH 179/223] python310Packages.pydeconz: 104 -> 105 --- pkgs/development/python-modules/pydeconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeconz/default.nix b/pkgs/development/python-modules/pydeconz/default.nix index 185e83450937..c81c42d47707 100644 --- a/pkgs/development/python-modules/pydeconz/default.nix +++ b/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "104"; + version = "105"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-bG2dhWa+KnSsigmOHE4wShaS56M9z6vqrFNek3PLbic="; + hash = "sha256-8GQJ4PCl8te3sovC5FwWoaQnXIRR27b7gPwfmyPRVBE="; }; propagatedBuildInputs = [ From 8fd76214e51916f96ab74cc15c9cbf083f7f32a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 11:19:23 +0100 Subject: [PATCH 180/223] python3Packages.pylutron-caseta: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/pylutron-caseta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron-caseta/default.nix b/pkgs/development/python-modules/pylutron-caseta/default.nix index 89b7dd6c7f39..114e295c66ea 100644 --- a/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pylutron-caseta"; - version = "0.17.0"; + version = "0.17.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gurumitts"; repo = pname; rev = "v${version}"; - hash = "sha256-8keKhwbvqIMxbfmd9GGF7uacOyvqb8G/ifq+pr4Z700="; + hash = "sha256-W3OfYNVendYOrwN/WGeAkNAnZctvlssZ3Bvp5caPZao="; }; nativeBuildInputs = [ From b563b609e0f4206d95696cae2774d15d4cf247c8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:42:44 +0100 Subject: [PATCH 181/223] python310Packages.pysma: 0.6.12 -> 0.7.2 (#196816) --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 5ec0aa44995e..96864141e054 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.6.12"; + version = "0.7.2"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uxMxqx5qbahMvTm3akiOTODhKLNVhHzBAUsOcZo/35I="; + sha256 = "sha256-hIrdT0b9XKw1UoPZtQQ7IaW+HV8wuA9Rwoo8XYdGyw8="; }; propagatedBuildInputs = [ From 6406b938358c2b38a284d7a4bac34ad1600e0a15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 00:44:25 +0100 Subject: [PATCH 182/223] python310Packages.subarulink: 0.5.0 -> 0.6.1 (#193462) --- pkgs/development/python-modules/subarulink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix index f25322531789..d788e164f80d 100644 --- a/pkgs/development/python-modules/subarulink/default.nix +++ b/pkgs/development/python-modules/subarulink/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "subarulink"; - version = "0.5.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "G-Two"; repo = pname; rev = "v${version}"; - hash = "sha256-q+a+OFFMAGl8KQi+KZ8h21+Pj0XEqP9ZIJii2PCgD6E="; + hash = "sha256-esZ+nIHIXKfilb8dBFbAbQQFI6fFRUcoFVCPdnqGXYw="; }; propagatedBuildInputs = [ From 0e7b91dd13908cedb47187a284e3b5770f22d9cb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 00:56:24 +0100 Subject: [PATCH 183/223] python3Packages.xknx: 1.1.0 -> 1.2.0 https://github.com/XKNX/xknx/releases/tag/1.2.0 --- pkgs/development/python-modules/xknx/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 315bcf87b17f..e82602d3458c 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Nam6TnjTAt5oV+IQ+6cS8L0/j/lp+x9adRHUTs69GA0="; + hash = "sha256-IHZvmVloBSLcK3GZV9urFeqRxOG76O9O/3ZDNTz4wjQ="; }; propagatedBuildInputs = [ @@ -41,6 +41,8 @@ buildPythonPackage rec { disabledTests = [ # Test requires network access "test_scan_timeout" + "test_start_secure_routing_knx_keys" + "test_start_secure_routing_manual" ]; meta = with lib; { From 3d3e6b8ac13c5a50ae3854f96a6a9320b67fc3c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:04:50 +0000 Subject: [PATCH 184/223] python310Packages.zha-quirks: 0.0.83 -> 0.0.84 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index b48804ed8670..94bf7cf397ab 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.83"; + version = "0.0.84"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-N+DSaPohwkMJ+YjbnUi7k8GQ+YFd6Ng8n0yesEnOnRA="; + hash = "sha256-x8DOUQjjOlLaIhsLLbGNEE+MYBcMD+VsmcCDU0XxxcE="; }; propagatedBuildInputs = [ From c38beec6b2849ffb4e285c0fdf38d197bab15d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:05:28 +0000 Subject: [PATCH 185/223] python310Packages.zigpy: 0.51.3 -> 0.51.5 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index fbce8f8db61e..c7abaac023aa 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.51.3"; + version = "0.51.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-IfYWuJfmQtJnVANyiBE3AurhucqZ8qzYXBV3jprS5qw="; + hash = "sha256-6OSP23lEdl15IjSqGYLCW5+F6rki+rzmXm82QRzabwU="; }; propagatedBuildInputs = [ From 7be740d950202af2ad2a60074d8c35cd8205a1fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 04:07:31 +0000 Subject: [PATCH 186/223] python310Packages.zigpy-zigate: 0.10.2 -> 0.10.3 --- pkgs/development/python-modules/zigpy-zigate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix index 694871fbf78a..24cf7f30eb30 100644 --- a/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-zigate"; rev = "refs/tags/v${version}"; - hash = "sha256-Vb87G+R4SvAhCF3h/U5Q4/avxPgfIjklWdWGaiIWGhk="; + hash = "sha256-zO20ySRO9XFcDB8TkUJW2MxkhDIBpHp9Z24gupssOaY="; }; propagatedBuildInputs = [ From 35619a928d4e415541e75ef7f69377a7f0b95c90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:10:39 +0100 Subject: [PATCH 187/223] home-assistant: fix requirements parser version detection --- .../home-assistant/parse-requirements.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index b2d8e49efc58..a77b48c6b17e 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -168,8 +168,8 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional return None -def get_pkg_version(package: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: - pkg = packages.get(f"{PKG_SET}.{package}", None) +def get_pkg_version(attr_path: str, packages: Dict[str, Dict[str, str]]) -> Optional[str]: + pkg = packages.get(attr_path, None) if not pkg: return None return pkg["version"] @@ -198,12 +198,14 @@ def main() -> None: extras = name[name.find("[")+1:name.find("]")].split(",") name = name[:name.find("[")] attr_path = name_to_attr_path(name, packages) - if our_version := get_pkg_version(name, packages): - if Version.parse(our_version) < Version.parse(required_version): - outdated[name] = { - 'wanted': required_version, - 'current': our_version - } + if attr_path: + if our_version := get_pkg_version(attr_path, packages): + attr_name = attr_path.split(".")[-1] + if Version.parse(our_version) < Version.parse(required_version): + outdated[attr_name] = { + 'wanted': required_version, + 'current': our_version + } if attr_path is not None: # Add attribute path without "python3Packages." prefix pname = attr_path[len(PKG_SET + "."):] From de0d6bd58d4fd29559f41cc4b035795ce6cce93b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:11:54 +0100 Subject: [PATCH 188/223] python3Packages.pyrmvtransport: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pyrmvtransport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrmvtransport/default.nix b/pkgs/development/python-modules/pyrmvtransport/default.nix index e76152e218d4..1db84979e2a1 100644 --- a/pkgs/development/python-modules/pyrmvtransport/default.nix +++ b/pkgs/development/python-modules/pyrmvtransport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyrmvtransport"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cgtobi"; repo = pname; rev = "v${version}"; - sha256 = "0m74m3dhxmbv10hsvs7cpshzs3pg66va5lyq94i5j1nxrl9i7spb"; + sha256 = "sha256-nFxGEyO+wyRzPayjjv8WNIJ+XIWbVn0dyyjQKHiyr40="; }; nativeBuildInputs = [ From 171e8e0c8994ee2ba6ea919d847333b8cc1779d2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:15:14 +0100 Subject: [PATCH 189/223] python3Packages.av: 9.2.0 -> 10.0.0 --- pkgs/development/python-modules/av/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 088965d7dfd2..3457d2d37b23 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "av"; - version = "9.2.0"; + version = "10.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mikeboers"; repo = "PyAV"; rev = "v${version}"; - hash = "sha256-I7j+EzpvgKCNY8TbcaHsaWtetyvmno6YYhQTer2+Ds0="; + hash = "sha256-XcHP8RwC2iwD64Jc7SS+t9OxjFTsz3FbrnjMgJnN7Ak="; }; nativeBuildInputs = [ From a975823d5b148f58547bdbb4b0a444a609ae6712 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:29:48 +0100 Subject: [PATCH 190/223] python3Packages.mac-vendor-lookup: init at 0.1.12 --- .../mac-vendor-lookup/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/mac-vendor-lookup/default.nix diff --git a/pkgs/development/python-modules/mac-vendor-lookup/default.nix b/pkgs/development/python-modules/mac-vendor-lookup/default.nix new file mode 100644 index 000000000000..2c0a7d4f7240 --- /dev/null +++ b/pkgs/development/python-modules/mac-vendor-lookup/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiofiles +, aiohttp +}: + +buildPythonPackage rec { + pname = "mac-vendor-lookup"; + version = "0.1.12"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "bauerj"; + repo = "mac_vendor_lookup"; + rev = "5b57faac0c5a701a7e18085e331853397b68c07c"; + hash = "sha256-F/aiMs+J4bAesr6mKy+tYVjAjZ3l9vyHxV7zaaB6KbA="; + }; + + postPatch = '' + sed -i '/mac-vendors.txt/d' setup.py + ''; + + propagatedBuildInputs = [ + aiofiles + aiohttp + ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "mac_vendor_lookup" + ]; + + meta = with lib; { + description = "Find the vendor for a given MAC address"; + homepage = "https://github.com/bauerj/mac_vendor_lookup"; + license = licenses.asl20; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ea30fb92d97..2ca70dc4dd6f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5431,6 +5431,8 @@ self: super: with self; { mac_alias = callPackage ../development/python-modules/mac_alias { }; + mac-vendor-lookup = callPackage ../development/python-modules/mac-vendor-lookup { }; + macfsevents = callPackage ../development/python-modules/macfsevents { inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; }; From 35b0503fecb7b3daac0eecf6e940126c865d70b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:30:48 +0100 Subject: [PATCH 191/223] python3Packages.ibeacon-ble: 0.7.4 -> 1.0.1 --- .../python-modules/ibeacon-ble/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ibeacon-ble/default.nix b/pkgs/development/python-modules/ibeacon-ble/default.nix index 18476fac8c4b..ba4c156f3a56 100644 --- a/pkgs/development/python-modules/ibeacon-ble/default.nix +++ b/pkgs/development/python-modules/ibeacon-ble/default.nix @@ -1,7 +1,9 @@ { lib +, aiohttp , buildPythonPackage , fetchFromGitHub , home-assistant-bluetooth +, mac-vendor-lookup , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +11,7 @@ buildPythonPackage rec { pname = "ibeacon-ble"; - version = "0.7.4"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,26 +20,28 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-B+ftS/oNCECjCqB396K5iCl0aeJSBGVXshlvZ1kvEuo="; + hash = "sha256-iYgGflM0IpSIMNgPpJAFAl9FYoMfRinM3sP6VRcBSMc="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + aiohttp home-assistant-bluetooth + mac-vendor-lookup ]; checkInputs = [ pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace " --cov=ibeacon_ble --cov-report=term-missing:skip-covered" "" - ''; - pythonImportsCheck = [ "ibeacon_ble" ]; From 69cf4149ab2fb9ed26f6f81d354a2e2c7b3d45b7 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 5 Nov 2022 12:10:32 +0000 Subject: [PATCH 192/223] python3Packages.aiolifx-themes: init at v0.2.0 --- .../python-modules/aiolifx-themes/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/aiolifx-themes/default.nix diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix new file mode 100644 index 000000000000..4aeec041c043 --- /dev/null +++ b/pkgs/development/python-modules/aiolifx-themes/default.nix @@ -0,0 +1,58 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pythonOlder +, aiolifx +, poetry-core +, pytest-asyncio +, pytestCheckHook +, async-timeout +, typer +}: + +buildPythonPackage rec { + pname = "aiolifx-themes"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Djelibeybi"; + repo = "aiolifx-themes"; + rev = "v${version}"; + hash = "sha256:17498vdg8i20hk4i8hzc67qaj206ik3s1zn1k70plsjr9zlgs6vz"; + }; + + prePatch = '' + # Don't run coverage, or depend on typer for no reason. + substituteInPlace pyproject.toml \ + --replace " --cov=aiolifx_themes --cov-report=term-missing:skip-covered" "" \ + --replace "typer = " "# unused: typer = " + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiolifx + ]; + + checkInputs = [ + async-timeout + pytestCheckHook + pytest-asyncio + ]; + + pythonImportsCheck = [ + "aiolifx_themes" + ]; + + meta = with lib; { + description = "Color themes for LIFX lights running on aiolifx"; + homepage = "https://github.com/Djelibeybi/aiolifx-themes"; + license = licenses.mit; + maintainers = with maintainers; [ lukegb ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ca70dc4dd6f..ae46e21fd2e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -238,6 +238,8 @@ self: super: with self; { aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; + aiolifx-themes = callPackage ../development/python-modules/aiolifx-themes { }; + aiolimiter = callPackage ../development/python-modules/aiolimiter { }; aiolip = callPackage ../development/python-modules/aiolip { }; From 521dc77a2a9a8c640e98c66692f1dd5a478670ab Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 02:01:42 +0100 Subject: [PATCH 193/223] home-assistant: 2022.10.5 -> 2022.11.1 https://www.home-assistant.io/blog/2022/11/02/release-202211/ https://github.com/home-assistant/core/releases/tag/2022.11.1 --- .../home-assistant/component-packages.nix | 152 +++++++++++++++++- pkgs/servers/home-assistant/default.nix | 48 ++---- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 10 +- 4 files changed, 173 insertions(+), 41 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f2f472276c87..796546fd0b9f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,8 +2,10 @@ # Do not edit! { - version = "2022.10.5"; + version = "2022.11.1"; components = { + "3_day_blinds" = ps: with ps; [ + ]; "abode" = ps: with ps; [ abodepy ]; @@ -51,6 +53,21 @@ "airthings" = ps: with ps; [ airthings-cloud ]; + "airthings_ble" = ps: with ps; [ + aiohttp-cors + airthings-ble + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pyudev + sqlalchemy + ]; "airtouch4" = ps: with ps; [ airtouch4pyapi ]; @@ -98,6 +115,8 @@ amcrest ha-ffmpeg ]; + "amp_motorization" = ps: with ps; [ + ]; "ampio" = ps: with ps; [ asmog ]; @@ -203,6 +222,8 @@ yalexs-ble yalexs ]; + "august_ble" = ps: with ps; [ + ]; "aurora" = ps: with ps; [ auroranoaa ]; @@ -281,6 +302,10 @@ "blinksticklight" = ps: with ps; [ BlinkStick ]; + "bliss_automation" = ps: with ps; [ + ]; + "bloc_blinds" = ps: with ps; [ + ]; "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ @@ -352,6 +377,8 @@ "braviatv" = ps: with ps; [ pybravia ]; + "brel_home" = ps: with ps; [ + ]; "broadlink" = ps: with ps; [ broadlink ]; @@ -367,7 +394,9 @@ brunt ]; "bsblan" = ps: with ps; [ - bsblan + python-bsblan + ]; + "bswitch" = ps: with ps; [ ]; "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist @@ -388,6 +417,10 @@ pyudev sqlalchemy ]; + "bticino" = ps: with ps; [ + ]; + "bubendorff" = ps: with ps; [ + ]; "buienradar" = ps: with ps; [ buienradar ]; @@ -499,6 +532,8 @@ ]; "cover" = ps: with ps; [ ]; + "cozytouch" = ps: with ps; [ + ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy "cpuspeed" = ps: with ps; [ @@ -517,6 +552,8 @@ ]; "currencylayer" = ps: with ps; [ ]; + "dacia" = ps: with ps; [ + ]; "daikin" = ps: with ps; [ pydaikin ]; @@ -616,6 +653,10 @@ "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "diaz" = ps: with ps; [ + ]; + "digital_loggers" = ps: with ps; [ + ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; @@ -668,6 +709,8 @@ aiohttp-cors doorbirdpy ]; + "dooya" = ps: with ps; [ + ]; "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ @@ -944,6 +987,8 @@ "flexit" = ps: with ps; [ pymodbus ]; + "flexom" = ps: with ps; [ + ]; "flic" = ps: with ps; [ pyflic ]; @@ -1038,12 +1083,15 @@ "garages_amsterdam" = ps: with ps; [ garages-amsterdam ]; + "gaviota" = ps: with ps; [ + ]; "gc100" = ps: with ps; [ ]; # missing inputs: python-gc100 "gdacs" = ps: with ps; [ aio-georss-gdacs ]; "generic" = ps: with ps; [ + aiohttp-cors av pillow ]; @@ -1210,6 +1258,8 @@ pillow sqlalchemy ]; + "havana_shade" = ps: with ps; [ + ]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ @@ -1219,12 +1269,16 @@ ]; "heatmiser" = ps: with ps; [ ]; # missing inputs: heatmiserV3 + "heiwa" = ps: with ps; [ + ]; "heos" = ps: with ps; [ pyheos ]; "here_travel_time" = ps: with ps; [ herepy ]; + "hi_kumo" = ps: with ps; [ + ]; "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ @@ -1340,12 +1394,15 @@ aiohue ]; "huisbaasje" = ps: with ps; [ - ]; # missing inputs: energyflip-client + energyflip-client + ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ aiopvapi ]; + "hurrican_shutters_wholesale" = ps: with ps; [ + ]; "hvv_departures" = ps: with ps; [ pygti ]; @@ -1442,6 +1499,8 @@ ]; "input_text" = ps: with ps; [ ]; + "inspired_shades" = ps: with ps; [ + ]; "insteon" = ps: with ps; [ aiohttp-cors fnvhash @@ -1491,6 +1550,8 @@ "islamic_prayer_times" = ps: with ps; [ prayer-times-calculator ]; + "ismartwindow" = ps: with ps; [ + ]; "iss" = ps: with ps; [ ]; # missing inputs: pyiss "isy994" = ps: with ps; [ @@ -1640,6 +1701,8 @@ pyudev sqlalchemy ]; + "legrand" = ps: with ps; [ + ]; "lg_netcast" = ps: with ps; [ pylgnetcast ]; @@ -1656,6 +1719,7 @@ aiohttp-cors aiolifx aiolifx-effects + aiolifx-themes ifaddr ]; "lifx_cloud" = ps: with ps; [ @@ -1736,6 +1800,8 @@ "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; + "luxaflex" = ps: with ps; [ + ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ @@ -1764,6 +1830,10 @@ pillow sqlalchemy ]; + "marantz" = ps: with ps; [ + ]; + "martec" = ps: with ps; [ + ]; "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ @@ -2043,6 +2113,8 @@ "nexia" = ps: with ps; [ nexia ]; + "nexity" = ps: with ps; [ + ]; "nextbus" = ps: with ps; [ py-nextbusnext ]; @@ -2076,8 +2148,9 @@ aiohttp-cors getmac ifaddr + mac-vendor-lookup netmap - ]; # missing inputs: mac-vendor-lookup + ]; "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ @@ -2115,6 +2188,8 @@ "nut" = ps: with ps; [ pynut2 ]; + "nutrichef" = ps: with ps; [ + ]; "nws" = ps: with ps; [ pynws ]; @@ -2216,6 +2291,21 @@ "opple" = ps: with ps; [ pyoppleio ]; + "oralb" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + oralb-ble + pillow + pyserial + pyudev + sqlalchemy + ]; "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ @@ -2265,6 +2355,8 @@ pillow sqlalchemy ]; + "pcs_lighting" = ps: with ps; [ + ]; "peco" = ps: with ps; [ peco ]; @@ -2468,6 +2560,8 @@ ]; "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client + "raven_rock_mfg" = ps: with ps; [ + ]; "rdw" = ps: with ps; [ vehicle ]; @@ -2508,6 +2602,8 @@ ]; "rest_command" = ps: with ps; [ ]; + "rexel" = ps: with ps; [ + ]; "rflink" = ps: with ps; [ rflink ]; @@ -2535,6 +2631,8 @@ "rmvtransport" = ps: with ps; [ pyrmvtransport ]; + "roborock" = ps: with ps; [ + ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ @@ -2616,6 +2714,8 @@ lxml xmltodict ]; + "screenaway" = ps: with ps; [ + ]; "screenlogic" = ps: with ps; [ screenlogicpy ]; @@ -2647,6 +2747,8 @@ fnvhash sqlalchemy ]; + "sensorblue" = ps: with ps; [ + ]; "sensorpro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -2704,6 +2806,7 @@ "shell_command" = ps: with ps; [ ]; "shelly" = ps: with ps; [ + aiohttp-cors aioshelly ]; "shiftr" = ps: with ps; [ @@ -2732,6 +2835,8 @@ "simplisafe" = ps: with ps; [ simplisafe-python ]; + "simply_automated" = ps: with ps; [ + ]; "simulated" = ps: with ps; [ ]; "sinch" = ps: with ps; [ @@ -2770,9 +2875,15 @@ aiohttp-cors pysmappee ]; + "smart_blinds" = ps: with ps; [ + ]; + "smart_home" = ps: with ps; [ + ]; "smart_meter_texas" = ps: with ps; [ smart-meter-texas ]; + "smarther" = ps: with ps; [ + ]; "smartthings" = ps: with ps; [ pyturbojpeg aiohttp-cors @@ -2803,6 +2914,21 @@ "snmp" = ps: with ps; [ pysnmplib ]; + "snooz" = ps: with ps; [ + aiohttp-cors + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + dbus-fast + fnvhash + home-assistant-frontend + pillow + pyserial + pysnooz + pyudev + sqlalchemy + ]; "solaredge" = ps: with ps; [ solaredge stringcase @@ -2818,6 +2944,8 @@ "soma" = ps: with ps; [ pysoma ]; + "somfy" = ps: with ps; [ + ]; "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; @@ -2967,6 +3095,8 @@ ]; "switchmate" = ps: with ps; [ ]; # missing inputs: pySwitchmate + "symfonisk" = ps: with ps; [ + ]; "syncthing" = ps: with ps; [ aiosyncthing ]; @@ -3073,6 +3203,8 @@ sqlalchemy thermobeacon-ble ]; + "thermoplus" = ps: with ps; [ + ]; "thermopro" = ps: with ps; [ aiohttp-cors bleak-retry-connector @@ -3243,6 +3375,8 @@ "ukraine_alarm" = ps: with ps; [ uasiren ]; + "ultraloq" = ps: with ps; [ + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -3277,6 +3411,8 @@ ifaddr zeroconf ]; + "uprise_smart_shades" = ps: with ps; [ + ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ @@ -3557,6 +3693,7 @@ py-zabbix ]; "zamg" = ps: with ps; [ + zamg ]; "zengge" = ps: with ps; [ bluepy @@ -3630,6 +3767,7 @@ "airly" "airnow" "airthings" + "airthings_ble" "airtouch4" "airvisual" "airzone" @@ -3695,6 +3833,7 @@ "canary" "cast" "cert_expiry" + "clicksend_tts" "climate" "cloud" "cloudflare" @@ -3871,6 +4010,7 @@ "http" "huawei_lte" "hue" + "huisbaasje" "humidifier" "hunterdouglas_powerview" "hvv_departures" @@ -4005,6 +4145,7 @@ "nextdns" "nightscout" "nina" + "nmap_tracker" "no_ip" "nobo_hub" "notify" @@ -4033,6 +4174,7 @@ "openuv" "openweathermap" "opnsense" + "oralb" "overkiz" "ovo_energy" "owntracks" @@ -4145,6 +4287,7 @@ "smtp" "snips" "snmp" + "snooz" "solaredge" "solarlog" "solax" @@ -4297,6 +4440,7 @@ "yeelight" "yolink" "youless" + "zamg" "zeroconf" "zerproc" "zha" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 69ce9addcd67..795d42cf53eb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -41,26 +41,15 @@ let }; }); - bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { - version = "0.5.0"; - postPatch = null; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ super.cattrs ]; + gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: rec { + version = "2.2.3"; src = fetchFromGitHub { - owner = "liudger"; - repo = "python-bsblan"; - rev = "v.${version}"; - hash = "sha256-yzlHcIb5QlG+jAgEtKlAcY7rESiUY7nD1YwqK63wgcg="; - }; - }); - - blebox-uniapi = super.blebox-uniapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.2"; - src = fetchFromGitHub { - owner = "blebox"; - repo = "blebox_uniapi"; - rev = "refs/tags/v${version}"; - hash = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; + owner = "allenporter"; + repo = "gcal_sync"; + rev = "refs/tags/${version}"; + hash = "sha256-5PoKdJBrNhPfcDxmprc/1jX7weIs7HSxFzzvjKOjGbY="; }; + doCheck = false; # requires aiohttp>=1.0.0 }); gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { @@ -84,16 +73,6 @@ let }; }); - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - hash = "sha256-GDJwPBEU7cteAdYj7eo5tAo0G8AVcQR7KSxLNLhU/XU="; - }; - }); - # pytest-aiohttp>0.3.0 breaks home-assistant tests pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { version = "0.3.0"; @@ -115,9 +94,6 @@ let aioopenexchangerates = super.aioopenexchangerates.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - gcal-sync = super.gcal-sync.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires aiohttp>=1.0.0 - }); hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); @@ -161,6 +137,12 @@ let }; }); + pydaikin = super.pydaikin.overridePythonAttrs (oldAttrs: rec { + disabledTests = [ + "test_power_sensors" + ]; + }); + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -254,7 +236,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.10.5"; + hassVersion = "2022.11.1"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -272,7 +254,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-y2X6tiR3TLbQ1tYUUuu8D0i5j+P0FnDWJ1mSlGPwIuY="; + hash = "sha256-2zpNrkRYsmJEq+4L0J6wJodmda5r8NWgYVtYwAHKSps="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 5282874435f3..9f9bcf022356 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20221010.0"; + version = "20221102.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-TyaEnXHnaFk+V06BjeblYv6VnXsmYCc/7mYicJsBEY8="; + sha256 = "sha256-HAFJxrBI6wB1XMe+71tF/bijuQAoyAw8LBQbfv+Vqco="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index c40d9e71989c..1651e3026644 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -47,6 +47,10 @@ let # bytearrray mismatch "test_rfy_cover" ]; + zha = [ + # 'manual_pick_radio_type' == 'choose_serial_port' + "test_options_flow_migration_reset_old_adapter" + ]; }; extraPytestFlagsArray = { @@ -62,6 +66,10 @@ let # Flaky: AssertionError: assert '0.0' == '12.0' "--deselect tests/components/history_stats/test_sensor.py::test_end_time_with_microseconds_zeroed" ]; + modem_callerid = [ + # aioserial mock produces wrong state + "--deselect tests/components/modem_callerid/test_init.py::test_setup_entry" + ]; skybell = [ # Sandbox network limitations: Cannot connect to host cloud.myskybell.com:443 "--deselect tests/components/skybell/test_config_flow.py::test_flow_user_unknown_error" @@ -106,8 +114,6 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( meta = old.meta // { broken = lib.elem component [ - "modem_callerid" - "subaru" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; From 7bbc6e29b134f277ed40fd81948ddb367cbdb64f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 12:39:00 +0100 Subject: [PATCH 194/223] nixos/home-assistant: update bluetooth components --- nixos/modules/services/home-automation/home-assistant.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 26a5e3fe44b8..2962e52c08bb 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -433,6 +433,8 @@ in { componentsUsingBluetooth = [ # Components that require the AF_BLUETOOTH address family "august" + "august_ble" + "airthings_ble" "bluemaestro" "bluetooth" "bluetooth_le_tracker" @@ -445,15 +447,19 @@ in { "govee_ble" "homekit_controller" "inkbird" + "keymitt_ble" "led_ble" "melnor" "moat" + "oralb" "qingping" "sensorpro" "sensorpush" + "snooz" "switchbot" "thermobeacon" "thermopro" + "tilt_ble" "xiaomi_ble" "yalexs_ble" ]; From 88a8282e7c3d42c47b5051bcb612fc855115c83a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hl=C3=B6=C3=B0ver=20Sigur=C3=B0sson?= Date: Sat, 5 Nov 2022 12:34:34 +0000 Subject: [PATCH 195/223] faust2: darwin support --- pkgs/applications/audio/faust/faust2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 32bcbee2e6cd..19468b3af345 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -34,7 +34,7 @@ let homepage = "https://faust.grame.fr/"; downloadPage = "https://github.com/grame-cncm/faust/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ magnetophon pmahoney ]; }; From 12c069cd35b7aeec713207be0c1190cb8a68190c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 5 Nov 2022 13:39:28 +0100 Subject: [PATCH 196/223] webkitgtk: 2.38.1 -> 2.38.2 https://webkitgtk.org/2022/11/04/webkitgtk2.38.2-released.html https://webkitgtk.org/security/WSA-2022-0010.html Fixes: CVE-2022-32888, CVE-2022-32923, CVE-2022-42799, CVE-2022-42823 CVE-2022-42824 --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 59d258e9d98d..de61ae59a5ba 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.1"; + version = "2.38.2"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; + hash = "sha256-8+uCiZZR9YO02Zys0Wr3hKGncQ/OnntoB71szekJ/j4="; }; patches = lib.optionals stdenv.isLinux [ From 751f0f831672e12fa86c19c547d1752d1a48ca1f Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 5 Nov 2022 14:14:30 +0100 Subject: [PATCH 197/223] python3Packages.mpi4py: cleanup inputs and meta data --- pkgs/development/python-modules/mpi4py/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 8ea726de8525..d6c5fac48593 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -41,11 +41,13 @@ buildPythonPackage rec { setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - nativeBuildInputs = [ mpi openssh ]; + nativeBuildInputs = [ mpi ]; + + checkInputs = [ openssh ]; meta = with lib; { description = "Python bindings for the Message Passing Interface standard"; - homepage = "https://bitbucket.org/mpi4py/mpi4py/"; - license = licenses.bsd3; + homepage = "https://github.com/mpi4py/mpi4py"; + license = licenses.bsd2; }; } From a18ecf7b73476e9e8f2f484d476b44ca790f676e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 5 Nov 2022 21:40:45 +0800 Subject: [PATCH 198/223] tio: remove unused cmake from nativeBuildInputs https://github.com/jtojnar/nixpkgs-hammering/blob/main/explanations/meson-cmake.md --- pkgs/tools/misc/tio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index ff7c4143c2a9..cacc770052fa 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, inih, bash-completion }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, inih, bash-completion }: stdenv.mkDerivation rec { pname = "tio"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hash = "sha256-BjA9Zl6JcgDxTj4KPiWItSq9XuX9FJkpZnhdMBGZQpQ="; }; - nativeBuildInputs = [ meson ninja cmake pkg-config inih bash-completion ]; + nativeBuildInputs = [ meson ninja pkg-config inih bash-completion ]; meta = with lib; { description = "Serial console TTY"; From 3b7410ff82190b17ae289fad4b4736f8760803a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 5 Nov 2022 15:17:30 +0100 Subject: [PATCH 199/223] python310Packages.plugwise: 0.25.4 -> 0.25.6 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9a938bdaa0ea..55874b166546 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.25.4"; + version = "0.25.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-avriroWSgBn80PzGEuvp/5yad9Q4onSxWLaLlpXDReo="; + sha256 = "sha256-n7+cEJC/RIbA4e5b19HncFOhzWhUZ8etxYsiER7zd8E="; }; propagatedBuildInputs = [ From 49caaf34d70a628de4b984ac464fa6047d55a239 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 14:27:53 +0000 Subject: [PATCH 200/223] flyctl: 0.0.427 -> 0.0.429 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 1a3af0cc497b..89256eae0be6 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.427"; + version = "0.0.429"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-rY/RrgkT3SjkAw1rQaTNHYecMzLy+go/BSd6/Hbz1qM="; + sha256 = "sha256-rx+5wHd6RyvsoL6176zBCgAZLCAXfdOIgZ41Vq48rdI="; }; - vendorSha256 = "sha256-wMVvDB/6ZDY3EwTWRJ1weCIlRZM+Ye24UnRl1YZzAcA="; + vendorSha256 = "sha256-pc9+m6oZGYBqDwE642HB4Ku549L3bMA52jWSmzV3tHc="; subPackages = [ "." ]; From 64686c25b749c0de8f3f2fcc09d083b97a5f6510 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 24 Oct 2022 10:47:45 +0200 Subject: [PATCH 201/223] =?UTF-8?q?ocamlPackages.lablgtk:=202.18.12=20?= =?UTF-8?q?=E2=86=92=202.18.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/lablgtk/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 17f32ef3edeb..9a4bf801d1e5 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,16 +1,19 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview }: +{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, gtksourceview +, camlp-streams +}: let param = let check = lib.versionAtLeast ocaml.version; in if check "4.06" then rec { - version = "2.18.12"; + version = "2.18.13"; src = fetchFromGitHub { owner = "garrigue"; repo = "lablgtk"; rev = version; - sha256 = "sha256:0asib87c42apwf1ln8541x6i3mvyajqbarifvz11in0mqn5k7g7h"; + sha256 = "sha256-69Svno0qLaUifMscnVuPUJlCo9d8Lee+1qiYx34G3Po="; }; NIX_CFLAGS_COMPILE = null; + buildInputs = [ camlp-streams ]; } else if check "3.12" then { version = "2.18.5"; src = fetchurl { @@ -26,11 +29,12 @@ let param = in stdenv.mkDerivation { - pname = "lablgtk"; + pname = "ocaml${ocaml.version}-lablgtk"; inherit (param) version src NIX_CFLAGS_COMPILE; nativeBuildInputs = [ pkg-config ocaml findlib ]; - buildInputs = [ gtk2 libgnomecanvas gtksourceview ]; + buildInputs = [ gtk2 libgnomecanvas gtksourceview ] + ++ param.buildInputs or []; configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; buildFlags = [ "world" ]; From adb52996cbd47fbbf6d61ae4562a62772fc396ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 14:31:35 +0000 Subject: [PATCH 202/223] flow: 0.191.0 -> 0.192.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0efe231568c3..23bc700190b5 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.191.0"; + version = "0.192.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-WS2Mm8hK03fXfjLLSL9V0itgmv8/tDQhN6G/C6SucOs="; + sha256 = "sha256-Eqn90vA48PKea2Qrj7sN1hWoU31KzAr7xbfF8Fwi9uw="; }; makeFlags = [ "FLOW_RELEASE=1" ]; From f23ddc55a6c695277b56a5cba37dfc322e5d1820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 5 Nov 2022 10:55:52 +0100 Subject: [PATCH 203/223] nixos/sane: mention sane-airscan in the extraBackends option It's a very useful backend (that probably should be enabled by default, like on Ubuntu), let's start by making it easier to discover. Ref https://github.com/NixOS/nixpkgs/issues/28406. --- nixos/modules/services/hardware/sane.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 5455cf56e8aa..cb9bee6130c6 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -70,10 +70,12 @@ in Packages providing extra SANE backends to enable. ::: {.note} - The example contains the package for HP scanners. + The example contains the package for HP scanners, and the package for + Apple AirScan and Microsoft WSD support (supports many + vendors/devices). ::: ''; - example = literalExpression "[ pkgs.hplipWithPlugin ]"; + example = literalExpression "[ pkgs.hplipWithPlugin pkgs.sane-airscan ]"; }; hardware.sane.disabledDefaultBackends = mkOption { From e01db33b9a68d78938bf5eddafa9d194ba2cd790 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 15:53:16 +0000 Subject: [PATCH 204/223] ghostunnel: 1.6.1 -> 1.7.0 --- pkgs/tools/networking/ghostunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ghostunnel/default.nix b/pkgs/tools/networking/ghostunnel/default.nix index 16350850163e..787e5f3df51a 100644 --- a/pkgs/tools/networking/ghostunnel/default.nix +++ b/pkgs/tools/networking/ghostunnel/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - sha256 = "sha256-VameENcHZ6AttV0D8ekPGGFoMHTiTXAY2FxK/Nxwjmk="; + sha256 = "sha256-vODSjTpo2oTY42fONhUU8Xn119cTYUGQ6RJaLnS9q3k="; }; vendorSha256 = null; From fd1711f46266380f4b3366c41b9412f1e40359ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 16:00:05 +0000 Subject: [PATCH 205/223] globalarrays: 5.8.1 -> 5.8.2 --- pkgs/development/libraries/globalarrays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 0a8b372a52fc..f7bc072f1757 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "globalarrays"; - version = "5.8.1"; + version = "5.8.2"; src = fetchFromGitHub { owner = "GlobalArrays"; repo = "ga"; rev = "v${version}"; - sha256 = "sha256-IyHdeIUHu/T4lb/etGGnNB2guIspual8/v9eS807Qco="; + sha256 = "sha256-2ffQIg9topqKX7ygnWaa/UunL9d0Lj9qr9xucsjLuoY="; }; nativeBuildInputs = [ autoreconfHook gfortran ]; From 2b43dcf62053734082da71104f96a4212882bb50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Nov 2022 16:07:15 +0000 Subject: [PATCH 206/223] google-guest-agent: 20221025.00 -> 20221104.00 --- pkgs/tools/virtualization/google-guest-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/google-guest-agent/default.nix b/pkgs/tools/virtualization/google-guest-agent/default.nix index 0f42441b7cd0..f007057222f7 100644 --- a/pkgs/tools/virtualization/google-guest-agent/default.nix +++ b/pkgs/tools/virtualization/google-guest-agent/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "guest-agent"; - version = "20221025.00"; + version = "20221104.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-LbpSRQgxAfgaO7UPJD5j/wrMjR383qjD5SD1cVTzWLs="; + sha256 = "sha256-JvI0tj6/+iCu+Q5XB3QOrrfBl6n2/bB6pj9lUDZL8DE="; }; vendorSha256 = "sha256-JZfplQGwe+UCzdMLMD+9JJ2ksK9dZ6scz2jl0XoZ9rI="; From 3c9272a5cf30dcda2fc5c7c53963b539fb5183ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 5 Nov 2022 13:07:20 -0300 Subject: [PATCH 207/223] linux-zen: 6.0.6-zen1 -> 6.0.7-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 27604f9618fe..da8818a722e1 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.6"; #zen + version = "6.0.7"; #zen suffix = "zen1"; #zen - sha256 = "11y942camfhwd32zkfyn232acgznp3n18g65kyp8k46hrkbhbxds"; #zen + sha256 = "011wlc0h99vx830qmgy569srhb3rzhyy5j235pf7m541392vh41g"; #zen isLqx = false; }; # ./update-zen.py lqx From 7a0eed9731f3ee926d70b80fbbf38a22ea7bb105 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 5 Nov 2022 11:07:40 -0500 Subject: [PATCH 208/223] duplicacy: 2.7.2 -> 3.0.1 --- pkgs/tools/backup/duplicacy/default.nix | 21 +- pkgs/tools/backup/duplicacy/deps.nix | 408 ------------------------ 2 files changed, 7 insertions(+), 422 deletions(-) delete mode 100644 pkgs/tools/backup/duplicacy/deps.nix diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 9fecfb70f398..94151373b5d8 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -1,26 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "duplicacy"; - version = "2.7.2"; - - goPackagePath = "github.com/gilbertchen/duplicacy"; + version = "3.0.1"; src = fetchFromGitHub { owner = "gilbertchen"; repo = "duplicacy"; rev = "v${version}"; - sha256 = "0j37sqicj7rl982czqsl3ipxw7k8k4smcr63s0yklxwz7ch3353c"; + sha256 = "sha256-7VCgXUmmAlmv0UwSM3Hs9t586gJWvFWsP/0BJXze1r4="; }; - goDeps = ./deps.nix; - buildPhase = '' - cd go/src/${goPackagePath} - go build duplicacy/duplicacy_main.go - ''; - installPhase = '' - install -D duplicacy_main $out/bin/duplicacy - ''; + vendorSha256 = "sha256-3vzx2SCgJAhSwW8DRtkQ6pywquFwwou0HZ6a1dmHhPY="; + + doCheck = false; meta = with lib; { homepage = "https://duplicacy.com"; diff --git a/pkgs/tools/backup/duplicacy/deps.nix b/pkgs/tools/backup/duplicacy/deps.nix deleted file mode 100644 index 83d69d398cbf..000000000000 --- a/pkgs/tools/backup/duplicacy/deps.nix +++ /dev/null @@ -1,408 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-cloud-go"; - rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; - sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "9bc4033dd347c7f416fca46b2f42a043dc1fbdf6"; - sha256 = "158xbd8wn1bna1k1ichlirz6a1zvlh3rg7klr9cnp72l2q8jwvcl"; - }; - } - { - goPackagePath = "github.com/aryann/difflib"; - fetch = { - type = "git"; - url = "https://github.com/aryann/difflib"; - rev = "e206f873d14a916d3d26c40ab667bca123f365a3"; - sha256 = "00zb9sx6l6b2zq614x45zlyshl20zjhwfj8r5krw4f9y0mx3n2dm"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "851d5ffb66720c2540cc68020d4d8708950686c8"; - sha256 = "16qp8ywcf04d2y1ibf3mpglcrxk07x8gak46a2l53lchps2mgcrp"; - }; - } - { - goPackagePath = "github.com/bkaradzic/go-lz4"; - fetch = { - type = "git"; - url = "https://github.com/bkaradzic/go-lz4"; - rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; - sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/gilbertchen/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/azure-sdk-for-go"; - rev = "8fd4663cab7c7c1c46d00449291c92ad23b0d0d9"; - sha256 = "123fj5jni1pjj8i9adzd4r07n9hnlmfprlcjf5hqb1zjb72xi1p7"; - }; - } - { - goPackagePath = "github.com/gilbertchen/cli"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/cli"; - rev = "1de0a1836ce9c3ae1bf737a0869c4f04f28a7f98"; - sha256 = "00vbyjsn009cqg24sxcizq10rgicnmrv0f8jg3fa1fw6yp5gqdl5"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go-dropbox"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go-dropbox"; - rev = "2233fa1dd846b3a3e8060b6c1ea12883deb9d288"; - sha256 = "01fqxad5mm7rs0mp1ipp9aw80ski6sqyqljpf9dgify8dbiffl97"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go-ole"; - rev = "0e87ea779d9deb219633b828a023b32e1244dd57"; - sha256 = "1d937b4i9mrwfgs1s17qhbd78dcd97wwm8zsajkarky8d55rz1bw"; - }; - } - { - goPackagePath = "github.com/gilbertchen/go.dbus"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/go.dbus"; - rev = "8591994fa32f1dbe3fa9486bc6f4d4361ac16649"; - sha256 = "0wg82hwgk4s65ns76x7cby6dfdxsdkc4jyqn9zd7g037fhzh8rk5"; - }; - } - { - goPackagePath = "github.com/gilbertchen/goamz"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/goamz"; - rev = "eada9f4e8cc2a45db775dee08a2c37597ce4760a"; - sha256 = "0v6i4jdly06wixmm58ygxh284hnlbfxczvcwxvywiyy9bp5qyaid"; - }; - } - { - goPackagePath = "github.com/gilbertchen/gopass"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/gopass"; - rev = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"; - sha256 = "1jxzyfnqi0h1fzlsvlkn10bncic803bfhslyijcxk55mgh297g45"; - }; - } - { - goPackagePath = "github.com/gilbertchen/keyring"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/keyring"; - rev = "8855f5632086e51468cd7ce91056f8da69687ef6"; - sha256 = "1ja623dqnhkr1cvynrcai10s8kn2aiq53cvd8yxr47bb8i2a2q1m"; - }; - } - { - goPackagePath = "github.com/gilbertchen/xattr"; - fetch = { - type = "git"; - url = "https://github.com/gilbertchen/xattr"; - rev = "68e7a6806b0137a396d7d05601d7403ae1abac58"; - sha256 = "120lq8vasc5yh0ajczsdpi8cfzgi4ymrnphgqdfcar3b9rsvx80b"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "8c9f03a8e57eb486e42badaed3fb287da51807ba"; - sha256 = "0vjjr79r32icjzlb05wn02k59av7jx0rn1jijml8r4whlg7dnkfh"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "84668698ea25b64748563aa20726db66a6b8d299"; - sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "c8a15bac9b9fe955bd9f900272f9a306465d28cf"; - sha256 = "13x3x7agq0b46wpchbd2sqli5l33z6hvfn1qjbiqvsgpbv7wd140"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/klauspost/cpuid"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/cpuid"; - rev = "750c0591dbbd50ef88371c665ad49e426a4b830b"; - sha256 = "1yiby4xa12j3kcw5q7dfsbcybhaxjkppvgz6ac2p2lcwha303b1g"; - }; - } - { - goPackagePath = "github.com/klauspost/reedsolomon"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/reedsolomon"; - rev = "7daa20bf74337a939c54f892a2eca9d9b578eb7f"; - sha256 = "1xk4wqgrl63l95lqnszzbpa06apzxfmpwfnkrn1n8jb0ws7mi01m"; - }; - } - { - goPackagePath = "github.com/kr/fs"; - fetch = { - type = "git"; - url = "https://github.com/kr/fs"; - rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba"; - sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q"; - }; - } - { - goPackagePath = "github.com/marstr/guid"; - fetch = { - type = "git"; - url = "https://github.com/marstr/guid"; - rev = "8bd9a64bf37eb297b492a4101fb28e80ac0b290f"; - sha256 = "081qrar6wwpmb2pq3swv4byh73r9riyhl2dwv0902d8jg3kwricm"; - }; - } - { - goPackagePath = "github.com/minio/blake2b-simd"; - fetch = { - type = "git"; - url = "https://github.com/minio/blake2b-simd"; - rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4"; - sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd"; - }; - } - { - goPackagePath = "github.com/minio/highwayhash"; - fetch = { - type = "git"; - url = "https://github.com/minio/highwayhash"; - rev = "86a2a969d04373bf05ca722517d30fb1c9a3e4f9"; - sha256 = "0kj2hs82sphag0h25xvprvf2fz3zlinmlif89sk9jp8h518aiahf"; - }; - } - { - goPackagePath = "github.com/mmcloughlin/avo"; - fetch = { - type = "git"; - url = "https://github.com/mmcloughlin/avo"; - rev = "443f81d771042b019379ae4bfcd0a591cb47c88a"; - sha256 = "1zc95crbyi7ylqq3jwv4ya55lyzn9x730szdm307vdss4gqlx8yn"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = "https://github.com/ncw/swift"; - rev = "3e1a09f21340e4828e7265aa89f4dc1495fa7ccc"; - sha256 = "19gb8xh400hzlbdp3nx1f85jxzs36zk0py39vmjcg3fnvdjzblm2"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "614d223910a179a466c1767a985424175c39b465"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pkg/sftp"; - fetch = { - type = "git"; - url = "https://github.com/pkg/sftp"; - rev = "5616182052227b951e76d9c9b79a616c608bd91b"; - sha256 = "1rjlhlkr505a0wvync1ycfn9njfc6bib6bw44qnnm50hlfs59hz2"; - }; - } - { - goPackagePath = "github.com/pkg/xattr"; - fetch = { - type = "git"; - url = "https://github.com/pkg/xattr"; - rev = "dd870b5cfebab49617ea0c1da6176474e8a52bf4"; - sha256 = "11ynkc61qrmf853g04sav8vawz8i6a8b73w71f3cq4djb4cnsw0d"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; - }; - } - { - goPackagePath = "github.com/vaughan0/go-ini"; - fetch = { - type = "git"; - url = "https://github.com/vaughan0/go-ini"; - rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; - sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "d835ff86be02193d324330acdb7d65546b05f814"; - sha256 = "0xj16iq5jp26hi2py7lsd8cvqh651fgn39y05gzvjdi88d9xd3nw"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "056763e48d71961566155f089ac0f02f1dda9b5a"; - sha256 = "0dcmns62hwid7hk4bmpl22z6ygjh168p23x3arzy320sd1lvap92"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "859b3ef565e237f9f1a0fb6b55385c497545680d"; - sha256 = "0ldgbx2zpprbsfn6p8pfgs4nn87gwbfcv2z0fa7n8alwsq2yw78q"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "d3edc9973b7eb1fb302b0ff2c62357091cea9a30"; - sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d622ce64ec6ce98d2c98f916b6303"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "59c9f1ba88faf592b225274f69c5ef1e4ebacf82"; - sha256 = "014iiqjh9sikbcvacqiwhg6mvrsrr1va91wmc9yrnsm11c63yxfa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "5d1fdd8fa3469142b9369713b23d8413d6d83189"; - sha256 = "0xp5ggnjnl1gqwi2ks042zimgkfv2qda9a57ar198xpyzdn1bv5s"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca"; - sha256 = "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/google-api-go-client"; - rev = "52f0532eadbcc6f6b82d6f5edf66e610d10bfde6"; - sha256 = "0l7q0mmq0v51wc72bk50nwaz9frl1pqp7gn5jhy1vzxdry930gkc"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "971852bfffca25b069c31162ae8f247a3dba083b"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/go-genproto"; - rev = "baae70f3302d3efdff74db41e48a5d476d036906"; - sha256 = "1xacik4i5w2bpkrxzrfm00ggy5vygbzh8jmm2yq4mxiv0lnsh9nk"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "ac54eec90516cee50fc6b9b113b34628a85f976f"; - sha256 = "17zfx4xgqjamk7rc1sivm5gppkh3j4qp3i294w9rqbv0rqi0c9pq"; - }; - } -] From ab9739da39014efef0d25112faa32cba6a212528 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 5 Nov 2022 11:07:57 -0500 Subject: [PATCH 209/223] duplicacy: add devusb to maintainers --- pkgs/tools/backup/duplicacy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 94151373b5d8..ea6a1ffa88ee 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -20,6 +20,6 @@ buildGoModule rec { description = "A new generation cloud backup tool"; platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.unfree; - maintainers = with maintainers; [ ffinkdevs ]; + maintainers = with maintainers; [ ffinkdevs devusb ]; }; } From 8896a5757950f32bdaaa4bfbf38488d94d7e4b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 5 Nov 2022 13:10:29 -0300 Subject: [PATCH 210/223] linux-lqx: 6.0.6-lqx1 -> 6.0.7-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index da8818a722e1..2fc9d8fe3c08 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.0.6"; #lqx + version = "6.0.7"; #lqx suffix = "lqx1"; #lqx - sha256 = "0f0bz2pmwwmbqdss1diblzn4lis1pw31pb4gkay4a5p61f4rw1mz"; #lqx + sha256 = "09h99fdzicbc4kkl51dqwgqqa9416hd7bvrghr4pdjqrw4z15557"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 7f29a5746a521fc6b736a2995454534eca9be9ce Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 5 Nov 2022 17:22:30 +0100 Subject: [PATCH 211/223] tomcat: 9.0.53 -> 9.0.68, 10.0.11 -> 10.0.27 Fixes CVE-2021-42340, CVE-2021-43980, CVE-2022-23181, CVE-2022-29885, CVE-2022-34305 and CVE-2022-42252. https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.68_(markt) https://tomcat.apache.org/tomcat-10.0-doc/changelog.html#Tomcat_10.0.27_(markt) --- pkgs/servers/http/tomcat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 8b0f814177aa..eec573b72f66 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,13 +32,13 @@ let in { tomcat9 = common { versionMajor = "9"; - versionMinor = "0.53"; - sha256 = "1zdnbb0bfbi7762lz69li0wf48jbfz1mv637jzcl42vbsxp4agkv"; + versionMinor = "0.68"; + sha256 = "sha256-rxsv8zEIIbTel4CqIuncS5pellGwgHamKRa0KgzsOF0="; }; tomcat10 = common { versionMajor = "10"; - versionMinor = "0.11"; - sha256 = "1hjvsxxxavni7bis1hm56281ffmf4x0zdh65zqkrnhqa1rbs0lg2"; + versionMinor = "0.27"; + sha256 = "sha256-N2atmOdhVrGx88eXOc9Wziq8kn7IWzTeFyFpir/5HLc="; }; } From bbb862227565df77cfbdda9dcf66e39682e97bc4 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 5 Nov 2022 17:40:12 +0100 Subject: [PATCH 212/223] timg: apply patch for CVE-2022-43151 https://github.com/hzeller/timg/issues/92 --- pkgs/tools/graphics/timg/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 136b5a241511..a8d808bb6370 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, graphicsmagick, libjpeg +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, graphicsmagick, libjpeg , ffmpeg, zlib, libexif, openslide }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1gdwg15fywya6k6pajkx86kv2d8k85pmisnq53b02br5i01y4k41"; }; + patches = [ + (fetchpatch { + url = "https://github.com/hzeller/timg/commit/e9667ea2c811aa9eb399b631aef9bba0d3711834.patch"; + sha256 = "sha256-xvbOcnKqX52wYZlzm4Be9dz8Rq+n3s2kKPFr0Y0igAU="; + name = "CVE-2022-43151.patch"; + }) + ]; + buildInputs = [ graphicsmagick ffmpeg libexif libjpeg openslide zlib ]; nativeBuildInputs = [ cmake pkg-config ]; From 11b9b7bf86781e12342eab9ac15d3ac95a7c4c21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 12:59:13 +0000 Subject: [PATCH 213/223] flent: 2.0.1 -> 2.1.1; fixes Manuel Mendez (4): flent: format with alejandra flent: Get python packages via python.pkgs Less confusing this way. flent: Add qtpy dependency This has been a gui requirement since v2.0.0 circa Jan 2021! flent: Ensure the gui tests are never skipped We always build with the gui enabled and we want to make sure it works. R. RyanTM (1): flent: 2.0.1 -> 2.1.1 --- .../applications/networking/flent/default.nix | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8df990ec4fa5..008579ea54fa 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,23 +1,39 @@ -{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python -, pythonPackages, qt5, sphinx, xvfb-run }: - +{ + lib, + buildPythonApplication, + fetchPypi, + procps, + python, + qt5, + xvfb-run, +}: buildPythonApplication rec { pname = "flent"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796"; + sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; }; - buildInputs = [ sphinx ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ matplotlib procps pyqt5 ]; - checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ]; + buildInputs = [python.pkgs.sphinx]; + nativeBuildInputs = [qt5.wrapQtAppsHook]; + propagatedBuildInputs = [ + procps + python.pkgs.matplotlib + python.pkgs.pyqt5 + python.pkgs.qtpy + ]; + checkInputs = [ + python.pkgs.mock + xvfb-run + ]; checkPhase = '' + # we want the gui tests to always run + sed -i 's|self.skip|pass; #&|' unittests/test_gui.py + cat >test-runner < Date: Sat, 5 Nov 2022 18:58:29 +0100 Subject: [PATCH 214/223] grafana: 9.2.2 -> 9.2.3 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.2.3 Also slightly security relevant: updates x/text to 0.4 which is not affected by CVE-2022-32149. --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7be5999aa34a..23558f7f760e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.2.2"; + version = "9.2.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-oXtEAhyCwV9DQfrun9rTPTeTCuzMv2l0sVyi2+pOASw="; + sha256 = "sha256-aqCGFgrODOdSJtvYDTygHsPhi5ON4fkpmFSnPZgR26U="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-trbc2iNDhBa72J15wPZKIlNJHbQUzE6cz/0TmivXJxE="; + sha256 = "sha256-m2pgRXxaXLRRl5iwfPuLqHEsxhuaCfSFCKSAKAYk9J8="; }; - vendorSha256 = "sha256-021b+Jdk1VUGNSVNef89KLbWLdy4XhhEry4S2S0AhRg="; + vendorSha256 = "sha256-2DO0eAKSJzavOKKHIl3beQhBhuARm7ccwwDODPByL4Y="; nativeBuildInputs = [ wire ]; From 472f3dfaa246e0c08e23afae1bc83b0c95ef96d7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 5 Nov 2022 19:16:37 +0100 Subject: [PATCH 215/223] apksigner: enable on unix platforms --- pkgs/development/tools/apksigner/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 854e913dd58e..c2bbf65526c1 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { homepage = "https://developer.android.com/studio/command-line/apksigner"; license = licenses.asl20; maintainers = with maintainers; [ linsui ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; }; } From 07fae5053b2fffff1c17f9e81e370d8f18bba463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sat, 5 Nov 2022 15:17:34 -0300 Subject: [PATCH 216/223] obs-studio-plugins.obs-vkcapture: 1.2.0 -> 1.2.1 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 0e61f4aaeca7..a1abc952fc73 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - hash = "sha256-yaN0am24p9gC+s64Rop+jQ3952UOtZund/KttnVxP48="; + hash = "sha256-FOyUgsHQlsjVGCct+ky189alVImoG+paqDKmGvnHoXo="; }; cmakeFlags = lib.optionals stdenv.isi686 [ From bfc4a9d9d33d44f7d183553be8e1712917f1213b Mon Sep 17 00:00:00 2001 From: clerie Date: Sat, 5 Nov 2022 19:20:43 +0100 Subject: [PATCH 217/223] dino: 0.3.0 -> 0.3.1 --- .../networking/instant-messengers/dino/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d18341b220f4..72e546286bf5 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "dino"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; rev = "v${version}"; - sha256 = "sha256-L5a5QlF9qlr4X/hGTabbbvOE5J1x/UVneWl/BRAa29Q="; + sha256 = "sha256-wjSgs1mUMV7j/8ZeXqWs8aOeWvJHwKziUfbtOC1HS3s="; }; nativeBuildInputs = [ From ae179a485e1ef1d6b6e393600c6c46450daf46b2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2022 15:23:27 +0200 Subject: [PATCH 218/223] ocamlPackages.ocaml_gettext: disable tests --- pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix | 2 +- pkgs/development/ocaml-modules/ocaml-gettext/default.nix | 7 +++---- pkgs/development/ocaml-modules/ocaml-gettext/stub.nix | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix index d36063300196..4466234fdbc2 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/camomile.nix @@ -2,7 +2,7 @@ buildDunePackage { pname = "gettext-camomile"; - inherit (ocaml_gettext) src version useDune2; + inherit (ocaml_gettext) src version; propagatedBuildInputs = [ camomile ocaml_gettext ]; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 26f932ff8d7c..481619ebd071 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -4,9 +4,7 @@ buildDunePackage rec { pname = "gettext"; version = "0.4.2"; - minimumOCamlVersion = "4.03"; - - useDune2 = true; + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; @@ -17,7 +15,8 @@ buildDunePackage rec { propagatedBuildInputs = [ gettext fileutils ]; - doCheck = true; + # Tests for version 0.4.2 are not compatible with OUnit 2.2.6 + doCheck = false; checkInputs = [ ounit ]; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix index 950ac652e54d..75e739959c3c 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "gettext-stub"; - inherit (ocaml_gettext) src version useDune2; + inherit (ocaml_gettext) src version; buildInputs = [ dune-configurator ]; From 8a88bac92b164558d330b40a34b86d9324ff5713 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 25 Oct 2022 15:23:31 +0200 Subject: [PATCH 219/223] =?UTF-8?q?ocamlPackages.ounit2:=202.2.4=20?= =?UTF-8?q?=E2=86=92=202.2.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ounit2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 0b68609584d4..f1358760696e 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -1,19 +1,19 @@ -{ lib, ocaml, buildDunePackage, fetchurl, stdlib-shims, ncurses }: +{ lib, ocaml, buildDunePackage, fetchurl, seq, stdlib-shims, ncurses }: buildDunePackage rec { minimumOCamlVersion = "4.04"; pname = "ounit2"; - version = "2.2.4"; + version = "2.2.6"; useDune2 = lib.versionAtLeast ocaml.version "4.08"; src = fetchurl { - url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-v${version}.tbz"; - sha256 = "0i9kiqbf2dp12c4qcvbn4abdpdp6h4g5z54ycsh0q8jpv6jnkh5m"; + url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz"; + sha256 = "sha256-BpD7Hg6QoY7tXDVms8wYJdmLDox9UbtrhGyVxFphWRM="; }; - propagatedBuildInputs = [ stdlib-shims ]; + propagatedBuildInputs = [ seq stdlib-shims ]; doCheck = true; checkInputs = lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; From 830a385b5f3f9a03c4f44f08071c655f9d85c2b3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 26 Oct 2022 09:56:24 +0200 Subject: [PATCH 220/223] =?UTF-8?q?ocamlPackages.stdint:=200.7.0=20?= =?UTF-8?q?=E2=86=92=200.7.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/stdint/default.nix | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/stdint/default.nix b/pkgs/development/ocaml-modules/stdint/default.nix index 2a4bf2bb6335..cec0ec818300 100644 --- a/pkgs/development/ocaml-modules/stdint/default.nix +++ b/pkgs/development/ocaml-modules/stdint/default.nix @@ -1,26 +1,18 @@ -{ lib, fetchurl, fetchpatch, buildDunePackage, ocaml, qcheck }: +{ lib, fetchurl, buildDunePackage, ocaml, qcheck }: buildDunePackage rec { pname = "stdint"; - version = "0.7.0"; + version = "0.7.2"; - useDune2 = true; + duneVersion = "3"; - minimumOCamlVersion = "4.03"; + minimalOCamlVersion = "4.03"; src = fetchurl { url = "https://github.com/andrenth/ocaml-stdint/releases/download/${version}/stdint-${version}.tbz"; - sha256 = "4fcc66aef58e2b96e7af3bbca9d910aa239e045ba5fb2400aaef67d0041252dc"; + sha256 = "sha256-FWAZjYvJx68+qVLEDavoJmZpQhDsw/35u/60MhHpd+Y="; }; - patches = [ - # fix test bug, remove at next release - (fetchpatch { - url = "https://github.com/andrenth/ocaml-stdint/commit/fc64293f99f597cdfd4470954da6fb323988e2af.patch"; - sha256 = "0nxck14vfjfzldsf8cdj2jg1cvhnyh37hqnrcxbdkqmpx4rxkbxs"; - }) - ]; - # 1. disable remaining broken tests, see # https://github.com/andrenth/ocaml-stdint/issues/59 # 2. fix tests to liberal test range @@ -30,9 +22,7 @@ buildDunePackage rec { --replace 'test "An integer should perform left-shifts correctly"' \ 'skip "An integer should perform left-shifts correctly"' \ --replace 'test "Logical shifts must not sign-extend"' \ - 'skip "Logical shifts must not sign-extend"' \ - --replace 'let pos_int = QCheck.map_same_type abs in_range' \ - 'let pos_int = QCheck.int_range 0 maxi' + 'skip "Logical shifts must not sign-extend"' ''; doCheck = lib.versionAtLeast ocaml.version "4.08"; From 90aff4b3e624bf2f0c90a6ba4fb317161abddf9e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 5 Nov 2022 06:31:32 +1000 Subject: [PATCH 221/223] conmon: 2.1.4 -> 2.1.5 https://github.com/containers/conmon/releases/tag/v2.1.5 --- pkgs/applications/virtualization/conmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 4f16053c1a40..25b89889b528 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d7fXbzbrqhP6zLVZo3gO+FyvZg7Z3AGlNSNLy0PD6EE="; + sha256 = "sha256-zpZ3hVgnh8gkrSghSvhSZnG9uaN+GTKFGHv+MMcs73Q="; }; nativeBuildInputs = [ pkg-config ]; From 66cf79f28218d47f076826001198b849366504de Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 5 Nov 2022 23:53:41 +0200 Subject: [PATCH 222/223] lib,doc: remove obvious usages of toString on paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It gives a warning on the lazy-trees branch of Nix (NixOS/nix#6530) one of these was also giving me an error (the one in lib/trivial probably) ``` $ nix build warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/installer/sd-card/sd -image-aarch64.nix' and then accessing it is deprecated, at /home/artturin/nixgits/my-nixpkgs/lib/modules. nix:349:99 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/.git' and then accessing it is dep recated, at /home/artturin/nixgits/my-nixpkgs/lib/sources.nix:35:32 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/system/etc/etc.nix' and then accessing it is deprecated, at «stdin»:0 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/system/etc/etc-activ ation.nix' and then accessing it is deprecated, at «stdin»:0 warning: applying 'toString' to path '/home/artturin/nixgits/my-nixpkgs/nixos/modules/installer/sd-card/sd -image-aarch64.nix' and then accessing it is deprecated, at «stdin»:0 error: cannot decode virtual path '/nix/store/virtual0000000000000000000000005-source' (use '--show-trace' to show detailed location information) ``` --- doc/doc-support/lib-function-locations.nix | 2 +- lib/sources.nix | 10 +++++----- lib/trivial.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 68edd2709854..ac4da88052da 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -38,7 +38,7 @@ let substr = builtins.substring prefixLen filenameLen filename; in substr; - removeNixpkgs = removeFilenamePrefix (builtins.toString pkgs.path); + removeNixpkgs = removeFilenamePrefix pkgs.path; liblocations = builtins.filter diff --git a/lib/sources.nix b/lib/sources.nix index cec395c9bb18..b7fb71bd0b0b 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -140,7 +140,7 @@ let origSrc = if isFiltered then src.origSrc else src; in lib.cleanSourceWith { filter = (path: type: - let relPath = lib.removePrefix (toString origSrc + "/") (toString path); + let relPath = lib.removePrefix (origSrc + "/") (path); in lib.any (re: match re relPath != null) regexes); inherit src; }; @@ -175,12 +175,12 @@ let */ commitIdFromGitRepo = let readCommitFromFile = file: path: - let fileName = toString path + "/" + file; - packedRefsName = toString path + "/packed-refs"; + let fileName = path + "/" + file; + packedRefsName = path + "/packed-refs"; absolutePath = base: path: if lib.hasPrefix "/" path then path - else toString (/. + "${base}/${path}"); + else /. + "${base}/${path}"; in if pathIsRegularFile path # Resolve git worktrees. See gitrepository-layout(5) then @@ -226,7 +226,7 @@ let pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); - canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); + canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext src); # -------------------------------------------------------------------------- # # Internal functions diff --git a/lib/trivial.nix b/lib/trivial.nix index 5d4fad8266bc..8f2023caaf8e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -213,8 +213,8 @@ rec { # Default value to return if revision can not be determined default: let - revisionFile = "${toString ./..}/.git-revision"; - gitRepo = "${toString ./..}/.git"; + revisionFile = ./.. + "/.git-revision"; + gitRepo = ./.. + "/.git"; in if lib.pathIsGitRepo gitRepo then lib.commitIdFromGitRepo gitRepo else if lib.pathExists revisionFile then lib.fileContents revisionFile From 836f31e1040dedd6d895570b6030d12f53e6e58a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 6 Nov 2022 00:52:27 +0100 Subject: [PATCH 223/223] trezor-suite: 22.8.2 -> 22.10.3 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index b110bd4e33be..941b1e1f6d0f 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "22.8.2"; + version = "22.10.3"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-tzGkEDVXOJaTfRPO4UUfDpqaddjeJvVHpf81A9hhpUTRIgbAO4fcOrTgJcgWCBotDo8nHCWjw+n5BG5PEfQ19Q=="; - x86_64-linux = "sha512-qUM3HGYXbVbLRYXetLGbShPU5ochuptCUNn0G5RD3tQeipVZsgRkQCSfZ1Zb3HgoPUOna3u8Mp7Ipu1n8xi3vg=="; + aarch64-linux = "sha512-fI0N1V+6SEZ9eNf+G/w5RcY8oeA5MsVzJnpnWoMzkkHZh5jVHgNbcqVgSPbzvQ/WZNv1MX37KETcxmDwRx//yw=="; + x86_64-linux = "sha512-zN89Qw6fQh27EaN9ARNwqhiBaiNoMic6Aq2UPG0OSUtOjEOdkGJ2pbR8MgWVccSgRH8ZmAAXZ0snVKfZWHbCjA=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); };