From 23d78742d2afc03c1911b482b0148c19ee6a9be4 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Mon, 12 Jun 2023 21:18:41 -0700 Subject: [PATCH 01/10] python310Packages.pylsp-mypy: 0.6.6 -> 0.6.7 (cherry picked from commit 8c00cae9ce2dc06b619e958263defbba2f875ce4) --- .../python-modules/pylsp-mypy/default.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pylsp-mypy/default.nix b/pkgs/development/python-modules/pylsp-mypy/default.nix index 5793cccd55ba..3a5879633114 100644 --- a/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -2,31 +2,46 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch +, setuptools , mypy , pytestCheckHook , python-lsp-server , pythonOlder -, toml +, tomli }: buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.6.6"; - format = "setuptools"; + version = "0.6.7"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { - owner = "Richardk2n"; + owner = "python-lsp"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - hash = "sha256-9B+GSEoQEqd1W/g0oup4xULKWOF0TgSG5DfBtyWA3vs="; + hash = "sha256-ZsNIw0xjxnU9Ue0C7TlhzVOCOCKEbCa2CsiiqeMb14I="; }; + patches = [ + # https://github.com/python-lsp/pylsp-mypy/pull/64 + (fetchpatch { + name = "fix-hanging-test.patch"; + url = "https://github.com/python-lsp/pylsp-mypy/commit/90d28edb474135007804f1e041f88713a95736f9.patch"; + hash = "sha256-3DVyUXVImRemXCuyoXlYbPJm6p8OnhBdEKmwjx88ets="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ mypy python-lsp-server - toml + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli ]; nativeCheckInputs = [ @@ -44,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mypy plugin for the Python LSP Server"; - homepage = "https://github.com/Richardk2n/pylsp-mypy"; + homepage = "https://github.com/python-lsp/pylsp-mypy"; license = licenses.mit; maintainers = with maintainers; [ cpcloud ]; }; From a104cef88783b29d1ec1477e375df857be5979d1 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Wed, 12 Jul 2023 09:56:30 +0200 Subject: [PATCH 02/10] libreoffice-bin: 7.4.3 -> 7.4.7 (cherry picked from commit 8e089e7135b2e8af8d3057ade80f9181d2ee3368) --- pkgs/applications/office/libreoffice/darwin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index eb5097a1b0e3..815eb78144d5 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -9,21 +9,21 @@ let appName = "LibreOffice.app"; scriptName = "soffice"; - version = "7.4.3"; + version = "7.4.7"; dist = { aarch64-darwin = rec { arch = "aarch64"; archSuffix = arch; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "cf95f9ecd4451d27e8304cea3ba116675267bdf75f08fbb60e0d8917f86edc04"; + sha256 = "d02513c6a58f35cb0da6880f76be3f4b3a620daaa9ce5c244d6efc40ed26a273"; }; x86_64-darwin = rec { arch = "x86_64"; archSuffix = "x86-64"; url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "fe569ba23bb74eb3e86974537dd80e504debe5fd8526a00edbad6be4da18986a"; + sha256 = "c8ae0cbaa043b30718a4ac0ca93369e887fe6a46bb3618cea054bffaafd8b8e2"; }; }; in From 899c2d178f4bd296afbde6d9900e1ab194a826e7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 28 Jun 2023 16:08:46 +0800 Subject: [PATCH 03/10] keycloak: 21.1.1 -> 21.1.2 Diff: https://github.com/keycloak/keycloak/compare/21.1.1...21.1.2 (cherry picked from commit e3e39e4fa8ea43ac56190e2a5758a88ebac58329) --- pkgs/servers/keycloak/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 714aa674cc9a..33271a80ee1f 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -3,7 +3,6 @@ , fetchzip , makeWrapper , jre -, writeText , nixosTests , callPackage @@ -13,11 +12,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "21.1.1"; + version = "21.1.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-ZX5UKjU9BEtO/uA25WhSUmeO6jQ1FpKF1irFx2fwPBU="; + hash = "sha256-yux9LyGkdwQekNWKAx3Oara0D5Qca8g7fgPGeTiF2n4="; }; nativeBuildInputs = [ makeWrapper jre ]; From 20c3ec10a7e7c406c7d74cd419ac02a1d88e0a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= Date: Mon, 17 Jul 2023 23:41:44 +0200 Subject: [PATCH 04/10] nixos/vaultwarden: Fix Markdown syntax of link The typo was introduced in 1d41cff3dc4c8f37bb5841f51fcbff705e169178 (cherry picked from commit 9858973daddbccb53a926265a5458e7e81791f8f) --- nixos/modules/services/security/vaultwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index aaa3f5507f77..61a2c7522866 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -116,7 +116,7 @@ in { The available configuration options can be found in [the environment template file](https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template). - See ()[#opt-services.vaultwarden.environmentFile) for how + See [](#opt-services.vaultwarden.environmentFile) for how to set up access to the Admin UI to invite initial users. ''; }; From 7128c51d6e5f9d238bee7169143c5d7cfc06a188 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Jun 2023 16:58:02 +0000 Subject: [PATCH 05/10] python310Packages.tidalapi: 0.7.0 -> 0.7.1 (cherry picked from commit 634fa7716ba4c67b02270b56a8438e400c5bfe38) --- pkgs/development/python-modules/tidalapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 405b7cea1198..7d9ac9a6044a 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-LdlTBkCOb7tXiupsNJ5lbk38syKXeADvi2IdGpW/dk8="; + hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g="; }; propagatedBuildInputs = [ From dbfc3874500938a7dadf3d9ad585e6e80fb58e7e Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Mon, 17 Jul 2023 11:22:04 -0400 Subject: [PATCH 06/10] python310Packages.tidalapi: 0.7.1 -> 0.7.2 This release fixes a critical bug; version 0.7.1 has not worked with the current version of the Tidal API for a couple weeks: https://github.com/tamland/python-tidal/issues/146 0.7.2 also changes the packaging method from setuptools to pyproject. (cherry picked from commit b673a2eaeba61b331b475078eb244d9a3a28ecfe) --- pkgs/development/python-modules/tidalapi/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 7d9ac9a6044a..87e84a43b916 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -3,19 +3,24 @@ , buildPythonPackage , fetchPypi , python-dateutil +, poetry-core , requests }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.1"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g="; + hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests python-dateutil From 00a4fc31b972c6faff84b88048c6d87775c49897 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Jul 2023 10:30:58 +0800 Subject: [PATCH 07/10] python310Packages.tidalapi: relax deps on requests --- pkgs/development/python-modules/tidalapi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 87e84a43b916..6c60d44d8f37 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -1,7 +1,7 @@ { lib -, stdenv , buildPythonPackage , fetchPypi +, pythonRelaxDepsHook , python-dateutil , poetry-core , requests @@ -19,6 +19,11 @@ buildPythonPackage rec { nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "requests" ]; propagatedBuildInputs = [ From c891876e1247d03eef7b8865f9ef77064362633d Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Sat, 17 Jun 2023 23:21:24 +0100 Subject: [PATCH 08/10] alfred,batctl: don't override PKG_CONFIG was added in 2016 but not necessary anymore to fix cross compilation (cherry picked from commit 7e3053b534472be706b516403b75112815a50847) --- pkgs/os-specific/linux/batman-adv/alfred.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 96040f2828cf..ae7d784591d2 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + makeFlags="PREFIX=$out" ''; meta = { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 079624c10ad6..b01f48a242a6 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + makeFlags="PREFIX=$out" ''; meta = { From 7f9e6cd8fcbc08d749f04d86567ea6a0e33843f2 Mon Sep 17 00:00:00 2001 From: Ganga Ram Date: Mon, 17 Jul 2023 23:03:39 +0400 Subject: [PATCH 09/10] alfred,batctl: fix cross compilation Don't override PKG_CONFIG Signed-off-by: Ganga Ram --- pkgs/os-specific/linux/batman-adv/alfred.nix | 2 +- pkgs/os-specific/linux/batman-adv/batctl.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 96040f2828cf..ae7d784591d2 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gpsd libcap libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + makeFlags="PREFIX=$out" ''; meta = { diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 079624c10ad6..b01f48a242a6 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnl ]; preBuild = '' - makeFlags="PREFIX=$out PKG_CONFIG=${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config" + makeFlags="PREFIX=$out" ''; meta = { From 9d4a63a914b43171b15151291f9db329ffcab562 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 18 Jul 2023 17:08:05 +0000 Subject: [PATCH 10/10] element-{desktop,web}: 1.11.35 -> 1.11.36 https://github.com/vector-im/element-desktop/releases/tag/v1.11.36 Fixes CVE-2023-37259 (cherry picked from commit f94dcef907f24fc8dc46c4d228a54cd3a4ada40d) --- .../networking/instant-messengers/element/pin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix index 280f8f669004..6f3cfa832567 100644 --- a/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.35"; + "version" = "1.11.36"; "hashes" = { - "desktopSrcHash" = "8BP7PC0ZqE3d0K1AxmG05Xh3Ze1dAOcBVW9ADW4YAjY="; - "desktopYarnHash" = "1k8ih7z9hxm38kbvnfimd0djwqlrs62s8i0hc6d6ii10l3binkzp"; - "webSrcHash" = "IM1M8iygeya8hw0uVjV4EK/jGG4UyQUTviYAvAjI7k4="; - "webYarnHash" = "0lr5cgs8nhdjrv43pcyhq4ysrz8bncx0j969j82l0chq3nzdml5b"; + "desktopSrcHash" = "MMTuyyUXur5Fy24aXPWtZbQLAaXR2R7coEi8ZOJo1YI="; + "desktopYarnHash" = "03wmdqnxzjrvdypwrb5z564liiqamwn6qmw2fww1mja8dkdkx5ng"; + "webSrcHash" = "u+Y/iLRlTd5RkczF6qIaer9HKFnm8LUGP8ZnB/WfiGI="; + "webYarnHash" = "0s9ly1hr9jvb2asgjf6g5n5n5w6qh51wkwyl7ps891c0hv9m28zm"; }; }