From 007705190394e8b7844ac052645b0b60ac10b86c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Nov 2023 04:20:00 +0000 Subject: [PATCH 1/7] ncnn: 20220729 -> 20231027 --- .../libraries/ncnn/cmakelists.patch | 18 +++++++++--------- pkgs/development/libraries/ncnn/default.nix | 5 +++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/ncnn/cmakelists.patch b/pkgs/development/libraries/ncnn/cmakelists.patch index 30f39a7a3f50..bdb3063acec4 100644 --- a/pkgs/development/libraries/ncnn/cmakelists.patch +++ b/pkgs/development/libraries/ncnn/cmakelists.patch @@ -2,15 +2,15 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index c453d23e..66b4aa24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -478,6 +478,8 @@ if(NCNN_VULKAN) - - find_package(Threads) - -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") -+ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") - include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") - if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") +@@ -560,6 +560,8 @@ if(NCNN_VULKAN) + message(WARNING "GLSLANG_TARGET_DIR must be defined! NCNN_SYSTEM_GLSLANG will be turned off.") + set(NCNN_SYSTEM_GLSLANG OFF) + else() ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") ++ include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") + include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") + if(EXISTS "${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") diff --git a/src/ncnn.pc.in b/src/ncnn.pc.in index b580fcee..be2becd0 100644 --- a/src/ncnn.pc.in diff --git a/pkgs/development/libraries/ncnn/default.nix b/pkgs/development/libraries/ncnn/default.nix index 0b07fab8668c..69967eae160d 100644 --- a/pkgs/development/libraries/ncnn/default.nix +++ b/pkgs/development/libraries/ncnn/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220729"; + version = "20231027"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; + sha256 = "sha256-ak/5QTOptg5M2I+3olnrBK6JZ01haIE6oh+sagEboAc="; }; patches = [ @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Tencent/ncnn"; license = licenses.bsd3; maintainers = with maintainers; [ tilcreator ]; + platforms = platforms.all; }; } From 1a2b2c88619804fb1dd1b2117293081986c234fe Mon Sep 17 00:00:00 2001 From: Chen Date: Thu, 16 Nov 2023 02:49:28 +0800 Subject: [PATCH 2/7] ngrok: 3.3.4 -> 3.4.0 --- pkgs/tools/networking/ngrok/versions.json | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index 75a00531f2b7..ef2b4e3d235d 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/3iiMKzJiBb/ngrok-v3-3.3.4-linux-386", - "sha256": "e46b1bfa8afe28b2c5a7630773ab2d8fc1c91ac42e262356c1cec1197e754419", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", + "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", + "version": "3.4.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/99d4KobYYHN/ngrok-v3-3.3.4-linux-amd64", - "sha256": "11536e5a001de5efa9a6d9d6f33b0ed2dc653216278fe0314f9ca98c20137a7f", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", + "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", + "version": "3.4.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/2VZGKNPHQqs/ngrok-v3-3.3.4-linux-arm", - "sha256": "08d7b27407005c9a34a850090527c1398e86a1a2fa090aea2caee40cb18902fe", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", + "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", + "version": "3.4.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/2XmLxPHmx2B/ngrok-v3-3.3.4-linux-arm64", - "sha256": "1e12cedb3378d25012c3cd94f960123b4d8b99301d52ad9c30df9e698ed1fa2d", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", + "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", + "version": "3.4.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/mos87CnnNu3/ngrok-v3-3.3.4-darwin-amd64", - "sha256": "700311045d531f603a5f472c7e4b8271810ac75e368c65430a62f5e178abe9dc", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", + "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", + "version": "3.4.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/ngMbyRxxdNN/ngrok-v3-3.3.4-darwin-arm64", - "sha256": "e609d3d78d004ec4f795581cba35f38ba43e7b0b5ae1cd80aa21650402e531d0", - "version": "3.3.4" + "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", + "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", + "version": "3.4.0" } } From 22bdd87f31195d55d336817c6b62c3c779e47004 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 19 Nov 2023 15:02:00 -0500 Subject: [PATCH 3/7] xh: 0.19.4 -> 0.20.1 Diff: https://github.com/ducaale/xh/compare/v0.19.4...v0.20.1 Changelog: https://github.com/ducaale/xh/blob/v0.20.1/CHANGELOG.md --- pkgs/tools/networking/xh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index 9d87db3408ef..63ca778c6db4 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "xh"; - version = "0.19.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "ducaale"; repo = "xh"; rev = "v${version}"; - sha256 = "sha256-L+qHcC5SQPHiflTc4vYmVyME1KyfG9wug3fO7ib7Ffk="; + sha256 = "sha256-e3AGegW0V7JK6iLy0PaMwSeA9+2wSouzX5QIYUg8HCk="; }; - cargoSha256 = "sha256-W6fqZJcyKm5+4DFm+lFxIACw3nvQ6TK3sZJdIrkxjjw="; + cargoSha256 = "sha256-JE8SKxc7fKlK637NCZnTKkbF4GNrrvJQ/2kGxK4WXpg="; buildFeatures = lib.optional withNativeTls "native-tls"; From 01ba168f065affde170603f494505b14c436cb46 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 19 Nov 2023 15:49:00 -0500 Subject: [PATCH 4/7] cherrybomb: 1.0.0 -> 1.0.1 Diff: https://diff.rs/cherrybomb/1.0.0/1.0.1 Changelog: https://github.com/blst-security/cherrybomb/releases/tag/v1.0.1 --- pkgs/tools/security/cherrybomb/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/cherrybomb/default.nix b/pkgs/tools/security/cherrybomb/default.nix index 9f1478a8d231..4bb975d3394c 100644 --- a/pkgs/tools/security/cherrybomb/default.nix +++ b/pkgs/tools/security/cherrybomb/default.nix @@ -1,30 +1,22 @@ { lib , rustPlatform , fetchCrate -, pkg-config -, openssl , stdenv , darwin }: rustPlatform.buildRustPackage rec { pname = "cherrybomb"; - version = "1.0.0"; + version = "1.0.1"; src = fetchCrate { inherit pname version; - hash = "sha256-qZ1eKcRAwCzrzvw6QR28oZ8sGnsXmoOW/bWLQTlpqlo="; + hash = "sha256-MHKBP102U1Ug9wZm9x4+opZgG8f6Hx03FvoLV4qaDgY="; }; - cargoHash = "sha256-eosK7MQ3UB8rxKHCrb3s3+BVarv19h0cL+uzwg95Hc8="; + cargoHash = "sha256-pj4+rG8XbrxVuNgnTVUTPmgrPBRSnoBnqFhOO/JGGWI="; - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - openssl - ] ++ lib.optionals stdenv.isDarwin [ + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 3a2fb868d9097760d1cebab35eaa0db4093e280a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Nov 2023 01:22:11 +0100 Subject: [PATCH 5/7] python311Packages.stdlib-list: 0.9.0 -> 0.10.0 https://github.com/pypi/stdlib-list/releases/tag/v0.10.0 --- pkgs/development/python-modules/stdlib-list/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix index 9cf75ab98ca1..86f7c6a7d629 100644 --- a/pkgs/development/python-modules/stdlib-list/default.nix +++ b/pkgs/development/python-modules/stdlib-list/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "stdlib-list"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; src = fetchPypi { pname = "stdlib_list"; inherit version; - hash = "sha256-mOtmE1l2yWtO4/TA7wVS67Wpl3zjAoQz23n0c4sCryY="; + hash = "sha256-ZRnFDWRVE+0odle/6FbVJ/J3MxVAaR3er3eyVFmWShQ="; }; nativeBuildInputs = [ From ecab0bcab4ade739f0f051148af0d15c8c5a822b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 20 Nov 2023 01:35:38 +0100 Subject: [PATCH 6/7] home-assistant: drop std-lib test dependency This was only required for Python 3.9 support and dropped upstream back in 2023/01. --- pkgs/servers/home-assistant/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1c0de1007962..04485f013993 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -460,7 +460,6 @@ in python.pkgs.buildPythonApplication rec { pytestCheckHook requests-mock respx - stdlib-list syrupy tomli # required through tests/auth/mfa_modules/test_otp.py From 3f21a22b5aafefa1845dec6f4a378a8f53d8681c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 21:50:58 +0000 Subject: [PATCH 7/7] jasper: 4.0.1 -> 4.1.0 --- pkgs/by-name/ja/jasper/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index fbd8b9f1657d..bb059cde347f 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasper"; - version = "4.0.1"; + version = "4.1.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "jasper"; rev = "version-${finalAttrs.version}"; - hash = "sha256-IQBszOKou5Q1lgDy2LICHFmOKYJ3/djmuHGNalVHeBQ="; + hash = "sha256-u5380inzLmOT0v6emOtjU3pIEQqTmziAVz1R6QG77x0="; }; outputs = [ "out" "doc" "man" ];