From d8eb7d36e0dff8470b73c9180c76f179d6cc29f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 May 2025 19:57:22 +0000 Subject: [PATCH 01/41] nats-server: 2.11.3 -> 2.11.4 --- pkgs/by-name/na/nats-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 41f5d202f377..dbc3cca86225 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.11.3"; + version = "2.11.4"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-Z4EBXWUtBzW65ONvt94sKzVDHw8qVz2cR5qewUm5nXI="; + hash = "sha256-LlAvT+u/FLuufWmUno/RM2E9/EEXSyM585My8eR156E="; }; - vendorHash = "sha256-uCNTUfYfMDjgM3RXsgAIzIFSuoHOCVks8aBR58RlU6Q="; + vendorHash = "sha256-d83bZWfZ+obEi79RHQJaucwlRfuLj1bleOfCVJpc7bU="; doCheck = false; From 770f223c2bb4e796d11f66cd0ad269de1efef43f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 27 May 2025 03:22:03 +0200 Subject: [PATCH 02/41] harper: 0.38.0 -> 0.39.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.39.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 3a65ecf600c9..89ab0226377f 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-kLOU88yz+7uC+AyvAh0DwPLYiClSL4ZgkPrBBFmDu8w="; + hash = "sha256-SLAhjeZOjng+ATKXN32VBhThmaP+YQZd6l9HnbqlHjQ="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-WhkIvo5hGYYvurq/7McCu3GMIJ8qmFeWm4JeruaZ00A="; + cargoHash = "sha256-tp5WO1FfzkUG69XWnRMW0njCPxr1/A/8ZfQ49xAkpVs="; passthru.updateScript = nix-update-script { }; From a31f77a520ceccfd558d28fd6858f6eb362e286d Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 30 May 2025 20:23:15 +0200 Subject: [PATCH 03/41] harper: 0.39.0 -> 0.40.0 Changelog: https://github.com/Automattic/harper/releases/tag/v0.40.0 --- pkgs/by-name/ha/harper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 89ab0226377f..ea6eca7fe723 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "harper"; - version = "0.39.0"; + version = "0.40.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${version}"; - hash = "sha256-SLAhjeZOjng+ATKXN32VBhThmaP+YQZd6l9HnbqlHjQ="; + hash = "sha256-QrIRfAehrKgJwAB3pWfSpIUnIwRLjuuRbTEgUpCe2LM="; }; buildAndTestSubdir = "harper-ls"; useFetchCargoVendor = true; - cargoHash = "sha256-tp5WO1FfzkUG69XWnRMW0njCPxr1/A/8ZfQ49xAkpVs="; + cargoHash = "sha256-hkr7gNRwY+L45Efk6mWPrykj60n3ChryBKRFCC4W1Q0="; passthru.updateScript = nix-update-script { }; From f35e7f8b6dea3694e62b32fc93a239598c983f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Jun 2025 19:14:16 +0000 Subject: [PATCH 04/41] openimageio: 3.0.6.1 -> 3.0.7.0 --- pkgs/by-name/op/openimageio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix index 884b9d61b331..103343b9d5fb 100644 --- a/pkgs/by-name/op/openimageio/package.nix +++ b/pkgs/by-name/op/openimageio/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimageio"; - version = "3.0.6.1"; + version = "3.0.7.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; tag = "v${finalAttrs.version}"; - hash = "sha256-ymg7uSnPBKotnV6/FaVBIndsz6oEP5gfZ1+poMIdR4I="; + hash = "sha256-eVX7X0wqTasEBRz4i98av1PzwdUVycBmtPjWS+31yIE="; }; outputs = [ From d6843fce63831d50fc12ea711dc631cf5d3d1f91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Jun 2025 16:32:34 +0000 Subject: [PATCH 05/41] mold: 2.39.1 -> 2.40.0 --- pkgs/by-name/mo/mold/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mold/package.nix b/pkgs/by-name/mo/mold/package.nix index 07161835189e..55e8c6f8a052 100644 --- a/pkgs/by-name/mo/mold/package.nix +++ b/pkgs/by-name/mo/mold/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mold"; - version = "2.39.1"; + version = "2.40.0"; src = fetchFromGitHub { owner = "rui314"; repo = "mold"; tag = "v${finalAttrs.version}"; - hash = "sha256-uC6oakFfF0tpSiBeps5IO41Khk7VyCMSZhVh2Gmwlyc="; + hash = "sha256-8EqAgdlvg7BSCTmMubqbq2t77xGcUI2RWEw2iuK5UXo="; }; nativeBuildInputs = [ From 39365a03598d3a190628fc04f4cb8f4c72d0da92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 04:50:27 +0000 Subject: [PATCH 06/41] airwindows: 0-unstable-2025-05-18 -> 0-unstable-2025-05-25 --- pkgs/by-name/ai/airwindows/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 0048aa8be958..4390bbd5e281 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-05-18"; + version = "0-unstable-2025-05-25"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "083d3d6df8ce3688fb328fd434e27653fa6433b5"; - hash = "sha256-Pfh+zVsAqlP7aVtzTzdaTDB0E/d3bJrexsFm6n93ABQ="; + rev = "751e1d0163a120ef03d8ece3accdcea6d689c1f5"; + hash = "sha256-jg1BFKtJH7eNmIrIw1o3NAOGnG8VK/Zq4r2wzyx2VYU="; }; # we patch helpers because honestly im spooked out by where those variables From c07073812d513a796f85076d6ad1aca960d7233a Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 09:13:53 +0200 Subject: [PATCH 07/41] box2d: 3.1.0 -> 3.1.1 Diff: https://github.com/erincatto/box2d/compare/refs/tags/v3.1.0...refs/tags/v3.1.1 Changelog: https://github.com/erincatto/box2d/releases/tag/v3.1.1 --- pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch | 6 ++++-- pkgs/by-name/bo/box2d/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch index dd76023882df..8d0c0eeb4488 100644 --- a/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch +++ b/pkgs/by-name/bo/box2d/cmake_use_system_glfw_and_imgui.patch @@ -1,8 +1,8 @@ diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt -index 5020345..97af8c6 100644 +index 46d5a23..7572b0b 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt -@@ -17,47 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") +@@ -17,49 +17,12 @@ set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "GLFW Examples") set(GLFW_BUILD_TESTS OFF CACHE BOOL "GLFW Tests") set(GLFW_INSTALL OFF CACHE BOOL "GLFW Install") @@ -43,6 +43,8 @@ index 5020345..97af8c6 100644 -target_link_libraries(imgui PUBLIC glfw glad) -target_include_directories(imgui PUBLIC ${IMGUI_DIR} ${IMGUI_DIR}/backends) -target_compile_definitions(imgui PUBLIC IMGUI_DISABLE_OBSOLETE_FUNCTIONS) +-# The sample app also uses stb_truetype and this keeps the symbols separate +-target_compile_definitions(imgui PRIVATE IMGUI_STB_NAMESPACE=imgui_stb) -set_target_properties(imgui PROPERTIES - CXX_STANDARD 20 - CXX_STANDARD_REQUIRED YES diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix index 27da46b1027e..8b3057b0288b 100644 --- a/pkgs/by-name/bo/box2d/package.nix +++ b/pkgs/by-name/bo/box2d/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "box2d"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "erincatto"; repo = "box2d"; tag = "v${finalAttrs.version}"; - hash = "sha256-QTSU1+9x8GoUK3hlTDMh43fc4vbNfFR7syt6xVHIuPs="; + hash = "sha256-IqQy9A8fWLG9H8ZPmOXeFZDaaks84miRuzXaFlNwm0g="; }; patches = [ From 86c5eed4f8e04a8422290e1374ec1341d253f464 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 09:42:46 +0200 Subject: [PATCH 08/41] python3Packages.hf-xet: 1.1.2 -> 1.1.3 Diff: https://github.com/huggingface/xet-core/compare/refs/tags/v1.1.2...refs/tags/v1.1.3 Changelog: https://github.com/huggingface/xet-core/releases/tag/v1.1.3 --- pkgs/development/python-modules/hf-xet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/hf-xet/default.nix b/pkgs/development/python-modules/hf-xet/default.nix index 38f1b4575f73..2d2f2aa5cb84 100644 --- a/pkgs/development/python-modules/hf-xet/default.nix +++ b/pkgs/development/python-modules/hf-xet/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hf-xet"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "xet-core"; tag = "v${version}"; - hash = "sha256-272xEw5W2Mo7a/OFpPbVNJMNc3TlmAsOdYFVw4HbXYk="; + hash = "sha256-Xj9Nq+Pg9sYfe06LyUVicBqnQRYwI/VCSo6n+YrvEnc="; }; sourceRoot = "${src.name}/hf_xet"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src sourceRoot ; - hash = "sha256-wV8qF3EARKkJWGQVhOPjgi7yKL1idRiuZrJ/HnL1BsQ="; + hash = "sha256-zJS1jBbE45F1JU0ROGXYJbZGfvuJSn/4GvML5xfhPbk="; }; nativeBuildInputs = [ From 82bd6b2a78890f4a6d59c0ecddc4ef17bd9df8b4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 4 Jun 2025 17:14:51 +0200 Subject: [PATCH 09/41] alloy6: 6.0.0 -> 6.2.0 --- pkgs/development/tools/alloy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 312d10a60c62..170c1705bd34 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -71,12 +71,12 @@ in rec { alloy5 = generic { version = "5.1.0"; - sha256 = "02k9khs4k5nc86x9pp5k3vcb0kiwdgcin46mlap4fycnr673xd53"; + sha256 = "sha256-o7Q+jsmWeUeuotUQG9lrPE6w2B6z3Ju6QcyWSTScaQo="; }; alloy6 = generic { - version = "6.0.0"; - sha256 = "sha256-rA7mNxcu0DWkykMyfV4JwFmQqg0HOIcwjjD4jCRxNww="; + version = "6.2.0"; + sha256 = "sha256-a4wctbyTvt/HxhQ1xOGrbmiKJC3HAqOUYo2amAHtt40="; }; alloy = alloy5; From 37a85289a0fa76d0783e849c09f33600d442cb2e Mon Sep 17 00:00:00 2001 From: Sam Connelly Date: Wed, 4 Jun 2025 12:02:59 -0400 Subject: [PATCH 10/41] maintainers: drop clevor --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/science/math/cemu-ti/default.nix | 2 +- pkgs/by-name/co/convbin/package.nix | 2 +- pkgs/by-name/co/convfont/package.nix | 2 +- pkgs/by-name/co/convimg/package.nix | 2 +- pkgs/by-name/fa/fasmg/package.nix | 5 +---- pkgs/by-name/li/libticables2/package.nix | 5 +---- pkgs/by-name/li/libticalcs2/package.nix | 5 +---- pkgs/by-name/li/libticonv/package.nix | 5 +---- pkgs/by-name/li/libtifiles2/package.nix | 5 +---- pkgs/by-name/me/metadata/package.nix | 2 +- pkgs/by-name/ti/tilem/package.nix | 5 +---- 12 files changed, 11 insertions(+), 35 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5314a22833d1..070342a3427d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4752,12 +4752,6 @@ githubId = 848609; name = "Michael Bishop"; }; - clevor = { - email = "myclevorname@gmail.com"; - github = "myclevorname"; - githubId = 140354451; - name = "Samuel Connelly"; - }; clkamp = { email = "c@lkamp.de"; github = "clkamp"; diff --git a/pkgs/applications/science/math/cemu-ti/default.nix b/pkgs/applications/science/math/cemu-ti/default.nix index 8de76351a7e8..896cb8d9c84b 100644 --- a/pkgs/applications/science/math/cemu-ti/default.nix +++ b/pkgs/applications/science/math/cemu-ti/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "CEmu"; homepage = "https://ce-programming.github.io/CEmu"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ clevor ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" "x86_64-darwin" diff --git a/pkgs/by-name/co/convbin/package.nix b/pkgs/by-name/co/convbin/package.nix index 512c0d6b889d..3812fbf4d810 100644 --- a/pkgs/by-name/co/convbin/package.nix +++ b/pkgs/by-name/co/convbin/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/mateoconlechuga/convbin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ clevor ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; mainProgram = "convbin"; }; diff --git a/pkgs/by-name/co/convfont/package.nix b/pkgs/by-name/co/convfont/package.nix index d740f068ea56..dd1423897667 100644 --- a/pkgs/by-name/co/convfont/package.nix +++ b/pkgs/by-name/co/convfont/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Converts font for use with FontLibC"; homepage = "https://github.com/drdnar/convfont"; license = lib.licenses.unfree; - maintainers = with maintainers; [ clevor ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; mainProgram = "convfont"; }; diff --git a/pkgs/by-name/co/convimg/package.nix b/pkgs/by-name/co/convimg/package.nix index 202cc987b1f4..1d9a3863dbc9 100644 --- a/pkgs/by-name/co/convimg/package.nix +++ b/pkgs/by-name/co/convimg/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/mateoconlechuga/convimg"; license = licenses.bsd3; - maintainers = with maintainers; [ clevor ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; mainProgram = "convimg"; }; diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index 66a20c9129e9..f12836e2f42f 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -90,10 +90,7 @@ stdenv.mkDerivation rec { mainProgram = "fasmg"; homepage = "https://flatassembler.net"; license = licenses.bsd3; - maintainers = with maintainers; [ - orivej - clevor - ]; + maintainers = with maintainers; [ orivej ]; platforms = with platforms; intersectLists (linux ++ darwin) x86; }; } diff --git a/pkgs/by-name/li/libticables2/package.nix b/pkgs/by-name/li/libticables2/package.nix index 162b8332c7f5..b2ed22b27cd2 100644 --- a/pkgs/by-name/li/libticables2/package.nix +++ b/pkgs/by-name/li/libticables2/package.nix @@ -69,10 +69,7 @@ stdenv.mkDerivation rec { description = "This library is part of the TiLP framework"; homepage = "http://lpg.ticalc.org/prj_tilp/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - siraben - clevor - ]; + maintainers = with maintainers; [ siraben ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/li/libticalcs2/package.nix b/pkgs/by-name/li/libticalcs2/package.nix index 4d488f260ef1..9cc1111328cc 100644 --- a/pkgs/by-name/li/libticalcs2/package.nix +++ b/pkgs/by-name/li/libticalcs2/package.nix @@ -44,10 +44,7 @@ stdenv.mkDerivation rec { description = "This library is part of the TiLP framework"; homepage = "http://lpg.ticalc.org/prj_tilp/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - siraben - clevor - ]; + maintainers = with maintainers; [ siraben ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/li/libticonv/package.nix b/pkgs/by-name/li/libticonv/package.nix index 5ef5348b7947..395f5e002023 100644 --- a/pkgs/by-name/li/libticonv/package.nix +++ b/pkgs/by-name/li/libticonv/package.nix @@ -33,10 +33,7 @@ stdenv.mkDerivation rec { description = "This library is part of the TiLP framework"; homepage = "http://lpg.ticalc.org/prj_tilp/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - siraben - clevor - ]; + maintainers = with maintainers; [ siraben ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/li/libtifiles2/package.nix b/pkgs/by-name/li/libtifiles2/package.nix index 6e2536604407..b5a1dbdb5ee5 100644 --- a/pkgs/by-name/li/libtifiles2/package.nix +++ b/pkgs/by-name/li/libtifiles2/package.nix @@ -33,10 +33,7 @@ stdenv.mkDerivation rec { description = "This library is part of the TiLP framework"; homepage = "http://lpg.ticalc.org/prj_tilp/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - siraben - clevor - ]; + maintainers = with maintainers; [ siraben ]; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index f9232b849ae1..df03dae973ef 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage { meta = { description = "Media metadata parser and formatter designed for human consumption, powered by FFmpeg"; - maintainers = with lib.maintainers; [ clevor ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.mit; homepage = "https://github.com/zmwangx/metadata"; mainProgram = "metadata"; diff --git a/pkgs/by-name/ti/tilem/package.nix b/pkgs/by-name/ti/tilem/package.nix index a5caea4922cc..9fee7818b287 100644 --- a/pkgs/by-name/ti/tilem/package.nix +++ b/pkgs/by-name/ti/tilem/package.nix @@ -33,10 +33,7 @@ stdenv.mkDerivation rec { homepage = "http://lpg.ticalc.org/prj_tilem/"; description = "Emulator and debugger for Texas Instruments Z80-based graphing calculators"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ - siraben - clevor - ]; + maintainers = with maintainers; [ siraben ]; platforms = platforms.linux ++ platforms.darwin; mainProgram = "tilem2"; }; From ecb9bc83b2987d9a8382df8842662a47d619e738 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:21:48 +0200 Subject: [PATCH 11/41] miniserve: use finalAttrs pattern --- pkgs/by-name/mi/miniserve/package.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 70196d7d6bcc..39903d1a37c0 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -7,27 +7,23 @@ curl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; version = "0.28.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; useFetchCargoVendor = true; cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; - nativeBuildInputs = [ - installShellFiles - ]; + nativeBuildInputs = [ installShellFiles ]; - nativeCheckInputs = [ - curl - ]; + nativeCheckInputs = [ curl ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" @@ -52,9 +48,9 @@ rustPlatform.buildRustPackage rec { meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; - changelog = "https://github.com/svenstaro/miniserve/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "miniserve"; }; -} +}) From 9d88cb90f604908751bf05e059c1f90d6ad0dc8e Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:22:21 +0200 Subject: [PATCH 12/41] miniserve: use tag in fetchFromGitHub --- pkgs/by-name/mi/miniserve/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 39903d1a37c0..756224465e2f 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; }; From f31bcc275d301e67062b07c43b5bb0793204bc81 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:26:46 +0200 Subject: [PATCH 13/41] miniserve: add versionCheckHook --- pkgs/by-name/mi/miniserve/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 756224465e2f..140e01be1e36 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -5,6 +5,7 @@ installShellFiles, stdenv, curl, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: { __darwinAllowLocalNetworking = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; From d4f2f43e48137eae7e24500b6b80b6e1a1a8a5a4 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:32:06 +0200 Subject: [PATCH 14/41] miniserve: add updateScript --- pkgs/by-name/mi/miniserve/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 140e01be1e36..98f171be57d8 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -6,6 +6,7 @@ stdenv, curl, versionCheckHook, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgramArg = "--version"; doInstallCheck = true; + passthru.updateScript = nix-update-script { }; + meta = { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; From 5058f4a040ee547c16e2f24fc63998ef60adbba5 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 29 May 2025 22:42:50 +0000 Subject: [PATCH 15/41] miniserve: 0.28.0 -> 0.29.0 --- pkgs/by-name/mi/miniserve/package.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 98f171be57d8..c89b69b28fb6 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -2,7 +2,10 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, installShellFiles, + openssl, + cacert, stdenv, curl, versionCheckHook, @@ -11,21 +14,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "miniserve"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-jrQnmIYap5eHVWPqoRsXVroB0VWLKxesi3rB/WylR0U="; + hash = "sha256-HHTNBqMYf7WrqJl5adPmH87xfrzV4TKJckpwTPiiw7w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-SosRbtk5gBcOVropy+HVFFmLLexu29GjchC6zFweiYw="; + cargoHash = "sha256-Rjql9cyw7RS66HE50iUrjNvS5JRhR1HBaalOY9eDGH4="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + pkg-config + installShellFiles + ]; - nativeCheckInputs = [ curl ]; + buildInputs = [ openssl ]; + + nativeCheckInputs = [ + curl + cacert + ]; checkFlags = [ "--skip=bind_ipv4_ipv6::case_2" From 529d5138d6b582c7530b864ea4e9efecaf669079 Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 30 May 2025 00:43:05 +0200 Subject: [PATCH 16/41] miniserve: add defelo as maintainer --- pkgs/by-name/mi/miniserve/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index c89b69b28fb6..34f88c26958e 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -69,7 +69,10 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/svenstaro/miniserve"; changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ figsoda ]; + maintainers = with lib.maintainers; [ + figsoda + defelo + ]; mainProgram = "miniserve"; }; }) From 4410ac3485f7f692baf480793171580e03672124 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 4 Jun 2025 18:37:40 +0200 Subject: [PATCH 17/41] python3Packages.granian: only use rust-jemalloc-sys on aarch64 --- pkgs/development/python-modules/granian/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix index 2698683c3a55..6c9b5ceba619 100644 --- a/pkgs/development/python-modules/granian/default.nix +++ b/pkgs/development/python-modules/granian/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, cacert, @@ -40,9 +41,10 @@ buildPythonPackage rec { maturinBuildHook ]; - buildInputs = [ + buildInputs = lib.optionals (stdenv.hostPlatform.isAarch64) [ # fix "Unsupported system page size" on aarch64-linux with 16k pages # https://github.com/NixOS/nixpkgs/issues/410572 + # only enabled on aarch64 due to https://github.com/NixOS/nixpkgs/pull/410611#issuecomment-2939564567 (rust-jemalloc-sys.overrideAttrs ( { configureFlags, ... }: { From 5cd05b7c9bec38ba998fadab2229d3aebcb5b1a5 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 4 Jun 2025 09:48:04 +0200 Subject: [PATCH 18/41] openscad-unstable: 2025-05-17 -> 2025-06-04 --- pkgs/by-name/op/openscad-unstable/package.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix index 8b14c7e8cfef..f8a2a0f7be6f 100644 --- a/pkgs/by-name/op/openscad-unstable/package.nix +++ b/pkgs/by-name/op/openscad-unstable/package.nix @@ -30,6 +30,7 @@ libsForQt5, libspnav, libzip, + manifold, mesa, mpfr, python3, @@ -45,12 +46,12 @@ # clang consume much less RAM than GCC clangStdenv.mkDerivation rec { pname = "openscad-unstable"; - version = "2025-05-17"; + version = "2025-06-04"; src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "c76900f9a62fcb98c503dcc5ccce380db8ac564b"; - hash = "sha256-R2/8T5+BugVTRIUVLaz6SxKQ1YrtyAGbiE4K1Fuc6bg="; + rev = "65856c9330f8cc4ffcaccf03d91b4217f2eae28d"; + hash = "sha256-jozcLFGVSfw8G12oSxHjqUyFtAfENgIByID+omk08mU="; fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold }; @@ -87,7 +88,6 @@ clangStdenv.mkDerivation rec { eigen fontconfig freetype - ghostscript glib gmp opencsg @@ -96,6 +96,7 @@ clangStdenv.mkDerivation rec { lib3mf libspnav libzip + manifold mpfr qscintilla qtbase @@ -115,9 +116,7 @@ clangStdenv.mkDerivation rec { "-DEXPERIMENTAL=ON" # enable experimental options "-DSNAPSHOT=ON" # nightly icons "-DUSE_BUILTIN_OPENCSG=OFF" - # use builtin manifold: 3.1.0 doesn't pass tests, builtin is 7c8fbe1, between 3.0.1 and 3.1.0 - # FIXME revisit on version update - "-DUSE_BUILTIN_MANIFOLD=ON" + "-DUSE_BUILTIN_MANIFOLD=OFF" "-DUSE_BUILTIN_CLIPPER2=OFF" "-DOPENSCAD_VERSION=\"${builtins.replaceStrings [ "-" ] [ "." ] version}\"" "-DCMAKE_UNITY_BUILD=OFF" # broken compile with unity @@ -150,14 +149,10 @@ clangStdenv.mkDerivation rec { nativeCheckInputs = [ mesa.llvmpipeHook ctestCheckHook + ghostscript ]; dontUseNinjaCheck = true; - checkFlags = [ - "-E" - # some fontconfig issues cause pdf output to have wrong font - "pdfexporttest" - ]; meta = with lib; { description = "3D parametric model compiler (unstable)"; From 49860b21df19cee7fe6082bb99bbf262ce8459aa Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 27 May 2025 18:50:02 +0800 Subject: [PATCH 19/41] readeck: 0.18.2 -> 0.19.2 --- pkgs/by-name/re/readeck/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readeck/package.nix b/pkgs/by-name/re/readeck/package.nix index d0082683eef4..00c9f2063ce3 100644 --- a/pkgs/by-name/re/readeck/package.nix +++ b/pkgs/by-name/re/readeck/package.nix @@ -27,14 +27,14 @@ in buildGoModule rec { pname = "readeck"; - version = "0.18.2"; + version = "0.19.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "readeck"; repo = "readeck"; tag = version; - hash = "sha256-geKhug1sQ51i+6qw2LVzW8lXyvre6AlVHWvGlEXWki8="; + hash = "sha256-gTU1RMd6b1wLIqI8VGa1Fn8+ydhW76E8ft5du71E1zM="; }; nativeBuildInputs = [ @@ -80,10 +80,10 @@ buildGoModule rec { npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-3MVrzpilJKptT0iRBQx2Cl0iKVoOJu5cBT987U1/C1k="; + hash = "sha256-RkyQ7uY7OIpBY7ep2L2Ilq5abY0f91g2uqigdS64sL0="; }; - vendorHash = "sha256-RjU3PW7GeMkQE0oHkI4EmFNr4HT3vRyFITUzYX9AHpw="; + vendorHash = "sha256-gqiK96FnfvRAzT0RUpYnT7HftZ1YV9jxbjstcKtGBho="; meta = { description = "Web application that lets you save the readable content of web pages you want to keep forever."; From 17f95268f30307f0353cf80f5d99cf78f97c5400 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Thu, 5 Jun 2025 03:47:00 +0800 Subject: [PATCH 20/41] nixos/readeck: add back MemoryDenyWriteExecute SQLite driver is reverted to its CGO version so this can be enabled --- nixos/modules/services/web-apps/readeck.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/readeck.nix b/nixos/modules/services/web-apps/readeck.nix index 0e5b68fc5faa..4c2c921b5a7c 100644 --- a/nixos/modules/services/web-apps/readeck.nix +++ b/nixos/modules/services/web-apps/readeck.nix @@ -69,6 +69,7 @@ in ExecStart = "${lib.getExe cfg.package} serve -config ${configFile}"; ProtectSystem = "full"; SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; NoNewPrivileges = true; PrivateTmp = true; PrivateDevices = true; From a395e1ac6dd1ce7f7ea3636d9d11057a168ead5c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Jun 2025 21:54:25 +0200 Subject: [PATCH 21/41] jujutsu: replace `git` with `gitMinimal` --- pkgs/by-name/ju/jujutsu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index f01f4ae94198..e91fdd85ce5f 100644 --- a/pkgs/by-name/ju/jujutsu/package.nix +++ b/pkgs/by-name/ju/jujutsu/package.nix @@ -4,7 +4,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, - git, + gitMinimal, gnupg, openssh, buildPackages, @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeCheckInputs = [ - git + gitMinimal gnupg openssh ]; From b05348651da80907d55802507b45e0e542b8b992 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Wed, 4 Jun 2025 12:58:37 -0700 Subject: [PATCH 22/41] samba: 4.20.4 -> 4.20.8 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 10946a0803d4..dc753bbb1b6d 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -79,11 +79,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "samba"; - version = "4.20.4"; + version = "4.20.8"; src = fetchurl { url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz"; - hash = "sha256-OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU="; + hash = "sha256-db4OjTH0UBPpsmD+fPMEo20tgSg5GRR3JXchXsFzqAc="; }; outputs = [ From 82b8a1e117609c3da5773d35921570542ad0ffc4 Mon Sep 17 00:00:00 2001 From: williamvds Date: Wed, 4 Jun 2025 20:54:52 +0100 Subject: [PATCH 23/41] maintainers: rename williamvds -> averyvigolo --- maintainers/maintainer-list.nix | 14 +++++++------- nixos/modules/services/networking/pihole-ftl.nix | 2 +- nixos/modules/services/web-apps/pihole-web.nix | 2 +- pkgs/by-name/aw/aws-assume-role/package.nix | 2 +- pkgs/by-name/pi/pihole-ftl/package.nix | 2 +- pkgs/by-name/pi/pihole-web/package.nix | 2 +- pkgs/by-name/pi/pihole/package.nix | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5314a22833d1..c341d71b7ae8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2539,6 +2539,13 @@ githubId = 59499799; keys = [ { fingerprint = "A0FF 4F26 6B80 0B86 726D EA5B 3C23 C7BD 9945 2036"; } ]; }; + averyvigolo = { + email = "nixpkgs@averyv.me"; + github = "averyvigolo"; + githubId = 26379999; + name = "Avery Vigolo"; + keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; } ]; + }; avh4 = { email = "gruen0aermel@gmail.com"; github = "avh4"; @@ -26644,13 +26651,6 @@ githubId = 5185341; name = "Will Cohen"; }; - williamvds = { - email = "nixpkgs@williamvds.me"; - github = "williamvds"; - githubId = 26379999; - name = "William Vigolo"; - keys = [ { fingerprint = "9848 B216 BCBE 29BB 1C6A E0D5 7A4D F5A8 CDBD 49C7"; } ]; - }; willibutz = { email = "willibutz@posteo.de"; github = "WilliButz"; diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix index 45cd2e5f927b..9920d269a501 100644 --- a/nixos/modules/services/networking/pihole-ftl.nix +++ b/nixos/modules/services/networking/pihole-ftl.nix @@ -478,6 +478,6 @@ in meta = { doc = ./pihole-ftl.md; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; }; } diff --git a/nixos/modules/services/web-apps/pihole-web.nix b/nixos/modules/services/web-apps/pihole-web.nix index fe62dec6afed..90c78b5299d5 100644 --- a/nixos/modules/services/web-apps/pihole-web.nix +++ b/nixos/modules/services/web-apps/pihole-web.nix @@ -99,6 +99,6 @@ in meta = { doc = ./pihole-web.md; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; }; } diff --git a/pkgs/by-name/aw/aws-assume-role/package.nix b/pkgs/by-name/aw/aws-assume-role/package.nix index 334b6c1ccbe8..9a5556f8dd6e 100644 --- a/pkgs/by-name/aw/aws-assume-role/package.nix +++ b/pkgs/by-name/aw/aws-assume-role/package.nix @@ -38,7 +38,7 @@ buildGoModule rec { homepage = "https://github.com/remind101/assume-role"; license = licenses.bsd2; mainProgram = "assume-role"; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; platforms = platforms.all; }; } diff --git a/pkgs/by-name/pi/pihole-ftl/package.nix b/pkgs/by-name/pi/pihole-ftl/package.nix index 2d3add1f70bc..281d5231fbf0 100644 --- a/pkgs/by-name/pi/pihole-ftl/package.nix +++ b/pkgs/by-name/pi/pihole-ftl/package.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Pi-hole FTL engine"; homepage = "https://github.com/pi-hole/FTL"; license = lib.licenses.eupl12; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; platforms = lib.platforms.linux; mainProgram = "pihole-FTL"; }; diff --git a/pkgs/by-name/pi/pihole-web/package.nix b/pkgs/by-name/pi/pihole-web/package.nix index 905987afd989..516b6862d2a3 100644 --- a/pkgs/by-name/pi/pihole-web/package.nix +++ b/pkgs/by-name/pi/pihole-web/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { FTLDNS. ''; license = lib.licenses.eupl12; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/pi/pihole/package.nix b/pkgs/by-name/pi/pihole/package.nix index d1c6f575b053..55d051213750 100644 --- a/pkgs/by-name/pi/pihole/package.nix +++ b/pkgs/by-name/pi/pihole/package.nix @@ -234,7 +234,7 @@ meta = { description = "A black hole for Internet advertisements"; license = lib.licenses.eupl12; - maintainers = with lib.maintainers; [ williamvds ]; + maintainers = with lib.maintainers; [ averyvigolo ]; platforms = lib.platforms.linux; mainProgram = "pihole"; }; From db4b9c9d7d494158d359e4d6caa32bc2d2f2938c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Jun 2025 20:41:21 +0000 Subject: [PATCH 24/41] fleet: 4.68.0 -> 4.68.1 --- pkgs/by-name/fl/fleet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix index a3e25fa41989..2029e819aeb5 100644 --- a/pkgs/by-name/fl/fleet/package.nix +++ b/pkgs/by-name/fl/fleet/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fleet"; - version = "4.68.0"; + version = "4.68.1"; src = fetchFromGitHub { owner = "fleetdm"; repo = "fleet"; tag = "fleet-v${finalAttrs.version}"; - hash = "sha256-C+rIRbeCdfQIAfAXSbvCGBFl16e7HhHPvNdJhLY82z8="; + hash = "sha256-XhnvhWjaU+McklFTsAhGEcSA+UkrYy8DgJ8ADE66U3o="; }; vendorHash = "sha256-ZdkpgZbXchDp5kiEgCsSsd3/ltltSRjOuTPOhiBEloc="; From 0cbfabfa486effc556366e3daecf4919f7a6c527 Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Mon, 12 Feb 2024 22:28:30 +0000 Subject: [PATCH 25/41] broadcast-box: init at 2025-06-04 --- .../br/broadcast-box/allow-no-env.patch | 13 ++++ pkgs/by-name/br/broadcast-box/package.nix | 69 +++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/by-name/br/broadcast-box/allow-no-env.patch create mode 100644 pkgs/by-name/br/broadcast-box/package.nix diff --git a/pkgs/by-name/br/broadcast-box/allow-no-env.patch b/pkgs/by-name/br/broadcast-box/allow-no-env.patch new file mode 100644 index 000000000000..cad4bbf5ff21 --- /dev/null +++ b/pkgs/by-name/br/broadcast-box/allow-no-env.patch @@ -0,0 +1,13 @@ +diff --git a/main.go b/main.go +index 1814da0..2befc13 100644 +--- a/main.go ++++ b/main.go +@@ -175,6 +175,8 @@ func main() { + if os.Getenv("APP_ENV") == "development" { + log.Println("Loading `" + envFileDev + "`") + return godotenv.Load(envFileDev) ++ } else if os.Getenv("APP_ENV") == "nixos" { ++ return nil + } else { + if _, err := os.Stat("./web/build"); os.IsNotExist(err) { + return noBuildDirectoryErr diff --git a/pkgs/by-name/br/broadcast-box/package.nix b/pkgs/by-name/br/broadcast-box/package.nix new file mode 100644 index 000000000000..a176bb35c510 --- /dev/null +++ b/pkgs/by-name/br/broadcast-box/package.nix @@ -0,0 +1,69 @@ +{ + lib, + nixosTests, + fetchFromGitHub, + buildNpmPackage, + buildGoModule, +}: +let + name = "broadcast-box"; + version = "0-unstable-2025-06-04"; + + src = fetchFromGitHub { + repo = "broadcast-box"; + owner = "Glimesh"; + rev = "a091f147f750759084a2c9d25a12e815e2feebf8"; + hash = "sha256-Evhye+DYtFM/VjxqmhH5kU32khvEFUxTUgH9DXytIbo="; + }; + + frontend = buildNpmPackage { + inherit version; + pname = "${name}-web"; + src = "${src}/web"; + npmDepsHash = "sha256-e1cCezmF20Q6JEXwPb1asRSXuC/GGaR+ImvrTabLl5c="; + preBuild = '' + # The VITE_API_PATH environment variable is needed + cp "${src}/.env.production" ../ + ''; + installPhase = '' + mkdir -p $out + cp -r build $out + ''; + }; +in +buildGoModule { + inherit version src frontend; + pname = name; + vendorHash = "sha256-Jpee7UmG9AB9SOoTv2fPP2l5BmkDPPdciGFu9Naq9h8="; + proxyVendor = true; # fixes darwin/linux hash mismatch + + patches = [ ./allow-no-env.patch ]; + postPatch = '' + substituteInPlace main.go \ + --replace-fail './web/build' '${placeholder "out"}/share' + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -r $frontend/build/* $out/share + + install -Dm755 $GOPATH/bin/broadcast-box -t $out/bin + + runHook postInstall + ''; + + passthru.tests = { + inherit (nixosTests) broadcast-box; + }; + + meta = { + description = "WebRTC broadcast server"; + homepage = "https://github.com/Glimesh/broadcast-box"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ JManch ]; + platforms = lib.platforms.unix; + mainProgram = "broadcast-box"; + }; +} From 4dbade0a185db49fe49e5e5455fa0a827179440f Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Sat, 23 Nov 2024 17:22:40 +0000 Subject: [PATCH 26/41] nixos/broadcast-box: init --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/video/broadcast-box.nix | 274 ++++++++++++++++++ 3 files changed, 277 insertions(+) create mode 100644 nixos/modules/services/video/broadcast-box.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index ce146d0cdedf..4c44cc4e5b08 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -20,6 +20,8 @@ - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable). Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable). +- [Broadcast Box](https://github.com/Glimesh/broadcast-box), a WebRTC broadcast server. Available as [services.broadcast-box](options.html#opt-services.broadcast-box.enable). + - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable). ## Backward Incompatibilities {#sec-release-25.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 955bd480d6c7..f093b10dc188 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1491,6 +1491,7 @@ ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix + ./services/video/broadcast-box.nix ./services/video/epgstation/default.nix ./services/video/frigate.nix ./services/video/go2rtc/default.nix diff --git a/nixos/modules/services/video/broadcast-box.nix b/nixos/modules/services/video/broadcast-box.nix new file mode 100644 index 000000000000..2038ca02ea37 --- /dev/null +++ b/nixos/modules/services/video/broadcast-box.nix @@ -0,0 +1,274 @@ +{ + lib, + pkgs, + config, + ... +}: +let + inherit (lib) + mkIf + mkEnableOption + mkPackageOption + mkOption + attrNames + types + match + optional + optionals + toInt + last + splitString + allUnique + concatStringsSep + all + filter + mapAttrs + any + getExe + maintainers + ; + inherit (cfg) settings; + cfg = config.services.broadcast-box; + + addressToPort = address: toInt (last (splitString ":" address)); + httpPort = cfg.web.port; + tcpMuxPort = addressToPort settings.TCP_MUX_ADDRESS; + httpRedirect = settings.ENABLE_HTTP_REDIRECT or (settings.HTTPS_REDIRECT_PORT != null); + + udpPorts = + optional (settings.UDP_MUX_PORT != null) settings.UDP_MUX_PORT + ++ optional (settings.UDP_WHEP_PORT != null) settings.UDP_WHEP_PORT + ++ optional (settings.UDP_WHIP_PORT != null) settings.UDP_WHIP_PORT; + tcpPorts = optional (settings.TCP_MUX_ADDRESS != null) tcpMuxPort; + webPorts = [ httpPort ] ++ optional httpRedirect settings.HTTPS_REDIRECT_PORT; +in +{ + options.services.broadcast-box = { + enable = mkEnableOption "Broadcast Box"; + package = mkPackageOption pkgs "broadcast-box" { }; + + web = { + host = mkOption { + type = types.str; + default = ""; + example = "127.0.0.1"; + description = '' + Host address the HTTP server listens on. By default the server + listens on all interfaces. + ''; + }; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Port the HTTP server listens on. + ''; + }; + + openFirewall = mkEnableOption '' + opening the HTTP server port and, if enabled, the HTTPS redirect server + port in the firewall. + ''; + }; + + openFirewall = mkEnableOption '' + opening WebRTC traffic ports in the firewall. Randomly selected ports + will not be opened. + ''; + + settings = mkOption { + visible = "shallow"; + + type = types.submodule { + freeformType = + with types; + attrsOf ( + nullOr (oneOf [ + bool + int + str + ]) + ); + options = { + TCP_MUX_ADDRESS = mkOption { + type = with types; nullOr (strMatching ".*:[0-9]+"); + default = null; + }; + + DISABLE_STATUS = mkOption { + type = types.bool; + default = true; + }; + + UDP_MUX_PORT = mkOption { + type = with types; nullOr port; + default = null; + }; + + UDP_WHEP_PORT = mkOption { + type = with types; nullOr port; + default = null; + }; + + UDP_WHIP_PORT = mkOption { + type = with types; nullOr port; + default = null; + }; + + ENABLE_HTTP_REDIRECT = mkOption { + type = types.bool; + default = false; + }; + + HTTPS_REDIRECT_PORT = mkOption { + type = with types; nullOr port; + default = if settings.ENABLE_HTTP_REDIRECT then 80 else null; + }; + }; + }; + + default = { + DISABLE_STATUS = true; + }; + + example = { + DISABLE_STATUS = true; + INCLUDE_PUBLIC_IP_IN_NAT_1_TO_1_IP = true; + UDP_MUX_PORT = 3000; + }; + + description = '' + Attribute set of environment variables. + + + + :::{.warning} + The status API exposes stream keys so {env}`DISABLE_STATUS` is enabled + by default. + ::: + ''; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !(settings ? HTTP_ADDRESS); + message = '' + The Broadcast Box `HTTP_ADDRESS` variable should not be used. Instead + use the `host` and `port` options. + ''; + } + { + assertion = httpRedirect -> settings ? SSL_CERT && settings ? SSL_KEY; + message = '' + The Broadcast Box `ENABLE_HTTP_REDIRECT` variable requires `SSL_CERT` + and `SSL_KEY` to be configured. + ''; + } + { + assertion = httpRedirect -> httpPort == 443; + message = '' + Broadcast Box HTTP redirect only works if the HTTP server listen port + is 443. + ''; + } + { + assertion = allUnique (tcpPorts ++ webPorts); + message = '' + Broadcast Box configuration contains duplicate TCP ports. + ''; + } + { + assertion = all (name: (match "[A-Z0-9_]+" name) != null) (attrNames settings); + message = + let + offenders = filter (name: (match "[A-Z0-9_]+" name) == null) (attrNames settings); + in + '' + Broadcast Box `settings` attribute names must be in uppercase snake + case. Invalid attribute name(s): `${concatStringsSep ", " offenders}` + ''; + } + ]; + + systemd.services.broadcast-box = { + description = "Broadcast Box"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + startLimitBurst = 3; + startLimitIntervalSec = 180; + + environment = + (mapAttrs ( + _: value: + if (builtins.typeOf value == "bool") then + if !value then null else "true" + else if (builtins.typeOf value == "int") then + toString value + else + value + ) cfg.settings) + // { + APP_ENV = "nixos"; + HTTP_ADDRESS = cfg.web.host + ":" + toString cfg.web.port; + }; + + serviceConfig = + let + priviledgedPort = any (p: p > 0 && p < 1024) (udpPorts ++ tcpPorts ++ webPorts); + in + { + ExecStart = "${getExe cfg.package}"; + Restart = "always"; + RestartSec = "10s"; + + DynamicUser = true; + LockPersonality = true; + NoNewPrivileges = true; + PrivateUsers = !priviledgedPort; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectClock = true; + ProtectProc = "invisible"; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProcSubset = "pid"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + CapabilityBoundingSet = if priviledgedPort then [ "CAP_NET_BIND_SERVICE" ] else ""; + AmbientCapabilities = mkIf priviledgedPort [ "CAP_NET_BIND_SERVICE" ]; + DeviceAllow = ""; + MemoryDenyWriteExecute = true; + UMask = "0077"; + }; + }; + + networking.firewall = { + allowedTCPPorts = optionals cfg.openFirewall tcpPorts ++ optionals cfg.web.openFirewall webPorts; + allowedUDPPorts = optionals cfg.openFirewall udpPorts; + }; + }; + + meta.maintainers = with maintainers; [ JManch ]; +} From ab778dc6b6a3ab3c0490942053bc5589e7d75cea Mon Sep 17 00:00:00 2001 From: Joshua Manchester Date: Tue, 13 Feb 2024 03:26:32 +0000 Subject: [PATCH 27/41] nixos/tests/broadcast-box: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/broadcast-box.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 nixos/tests/broadcast-box.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b03125926e88..a2236c4f779b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -264,6 +264,7 @@ in bpf = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./bpf.nix { }; bpftune = runTest ./bpftune.nix; breitbandmessung = runTest ./breitbandmessung.nix; + broadcast-box = runTest ./broadcast-box.nix; brscan5 = runTest ./brscan5.nix; btrbk = runTest ./btrbk.nix; btrbk-doas = runTest ./btrbk-doas.nix; diff --git a/nixos/tests/broadcast-box.nix b/nixos/tests/broadcast-box.nix new file mode 100644 index 000000000000..005cfc3dcd59 --- /dev/null +++ b/nixos/tests/broadcast-box.nix @@ -0,0 +1,21 @@ +{ pkgs, ... }: +{ + name = "broadcast-box"; + meta = { inherit (pkgs.broadcast-box.meta) maintainers; }; + + nodes.machine = { + services.broadcast-box = { + enable = true; + web = { + host = "127.0.0.1"; + port = 8080; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("broadcast-box.service") + machine.wait_for_open_port(8080) + machine.succeed("curl --fail http://localhost:8080/") + ''; +} From 77692cfde2724a612bf1d21ba7fb1751f959caf3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 23:18:11 +0200 Subject: [PATCH 28/41] python3Packages.torch-bin: 2.7.0 -> 2.7.1 Diff: https://github.com/pytorch/pytorch/compare/v2.7.0...v2.7.1 Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.1 --- .../torch/bin/binary-hashes.nix | 92 +++++++++---------- .../python-modules/torch/bin/default.nix | 2 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix index a94a39aae52a..3a7d0926ba26 100644 --- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix +++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.0" = { + "2.7.1" = { x86_64-linux-39 = { - name = "torch-2.7.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-9Eb5eyDLBwdHsQP7ZA35QbiMtoyNOwFTgofQXVan6HQ="; + name = "torch-2.7.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-c4rJs6155iohJW49JQzuhY3pVfk/ifqxFNqNGRk0fQY="; }; x86_64-linux-310 = { - name = "torch-2.7.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-rBhJVT7mc9+vtExhDGDLYKKJDw4Rf0NZmlJs93fri4w="; + name = "torch-2.7.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-1sPLoZjck/k0IqhUX0imaXiQNm5LlwH1Q1H8J+IwS9M="; }; x86_64-linux-311 = { - name = "torch-2.7.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-xLvAtL5gMZuhzvyQvpVXsxfws8Jh7s65bKbgND7sVr8="; + name = "torch-2.7.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-wwHcKARYr9lUUK95SSTJj+B1It0Uj/OEc5uBDj4xefI="; }; x86_64-linux-312 = { - name = "torch-2.7.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-fA8I0cRKAqutOJNz3d/OdZBLlppBC+L05RCUg909wM4="; + name = "torch-2.7.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-C2T30KbypzntBSupWfe2fGdwKMlWbOUZl/n5D+Vz3ao="; }; x86_64-linux-313 = { - name = "torch-2.7.0-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torch-2.7.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-0vafkJ2l3FIRPsZqhR1iB589UsgxhM9kvuvfEsovcFw="; + name = "torch-2.7.1-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torch-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-lWBCX56hrxeRUH6Mpw1bns9i/tfKImqV/NWNDrLMp48="; }; aarch64-darwin-39 = { - name = "torch-2.7.0-cp39-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp39-none-macosx_11_0_arm64.whl"; - hash = "sha256-zNdQkUFxOZeGG3qUfvCnFxQ81+kkCt3RaPOLqP0j/VY="; + name = "torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp39-none-macosx_11_0_arm64.whl"; + hash = "sha256-NRvpBdG6aT8xe+YDRB5O2VgO2ajX7hez2uYPov9Jv/c="; }; aarch64-darwin-310 = { - name = "torch-2.7.0-cp310-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp310-none-macosx_11_0_arm64.whl"; - hash = "sha256-NOAWjtbemRIWEtciJOWbKlioPa5kmZmQ6tpyYMXdWC0="; + name = "torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp310-none-macosx_11_0_arm64.whl"; + hash = "sha256-+MO+4mGwyOCQ9jR0kNxu4q6/1mHrDz9q6uBtmS2O1W8="; }; aarch64-darwin-311 = { - name = "torch-2.7.0-cp311-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp311-none-macosx_11_0_arm64.whl"; - hash = "sha256-Co1DyqNCuZhhAexf61u/HYZXC1yqAenLQmN4MRJY/d4="; + name = "torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp311-none-macosx_11_0_arm64.whl"; + hash = "sha256-aKNSx/Q1q7XLR+LAMtzRASdyriustvyLg7DBsRh0qzo="; }; aarch64-darwin-312 = { - name = "torch-2.7.0-cp312-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp312-none-macosx_11_0_arm64.whl"; - hash = "sha256-MLdoiocjmn3oPyaTM2Udjlgq//zm9ZH/8IwEb3eHKW4="; + name = "torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp312-none-macosx_11_0_arm64.whl"; + hash = "sha256-e0+LK4O9CPfTmQJamnsyO9u1PSBWbx4NWEaJu5LYL5o="; }; aarch64-darwin-313 = { - name = "torch-2.7.0-cp313-none-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0-cp313-none-macosx_11_0_arm64.whl"; - hash = "sha256-J/UAe99F97t69/EdGCjVwkh+AwaQr7PYmmUf1wNqOQ4="; + name = "torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1-cp313-none-macosx_11_0_arm64.whl"; + hash = "sha256-fs2GighkaOG890uR20JcHClRqc/NBZLExzN3t+Qkha4="; }; aarch64-linux-39 = { - name = "torch-2.7.0-cp39-cp39-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-fQpBBrwP4zkpX1CZAM5GIo9Fua2GRmYv5Qx9nllgw8E="; + name = "torch-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-pFUcuXuD31+T/A11ODMlNYKFgeHbLxea/ChwJ6+91ug="; }; aarch64-linux-310 = { - name = "torch-2.7.0-cp310-cp310-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-I4aFne5hkaJXHOFcZcPhgAjU5vF9UlbUm0Zg5UZNyug="; + name = "torch-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-wN8Xzul2U9CaToRIijPSEhf5skIIWDxVzyjwBFqrB2Y="; }; aarch64-linux-311 = { - name = "torch-2.7.0-cp311-cp311-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-zlEDde15Ij2z7BRP4Uy8/8ijYaxX85Z0OX/y2Ns7LCE="; + name = "torch-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-X+YEW49Ca/LQQm5P4AnxZnqVTsKuuC8b0L9gxteoVEU="; }; aarch64-linux-312 = { - name = "torch-2.7.0-cp312-cp312-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-qEW2872jxA9zaEfe3pXYv+yB+34RRYzSWXO6E1Qs8fY="; + name = "torch-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-O/LbWt93tDOETwgIh63gScRwXd+f4aMgI/+E/3Napa0="; }; aarch64-linux-313 = { - name = "torch-2.7.0-cp313-cp313-manylinux_2_28_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torch-2.7.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-rd+RB5OVIv+ztg0pAP7oOKd9vgmOJkPgEWT0b4YS+cA="; + name = "torch-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torch-2.7.1%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-6xdkZ5KsQ3T/yH5CNp9F0h7/F8eQholjuQSD7wtttO8="; }; }; } diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix index 268bd4ddca21..1f08d73ec9b8 100644 --- a/pkgs/development/python-modules/torch/bin/default.nix +++ b/pkgs/development/python-modules/torch/bin/default.nix @@ -35,7 +35,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "2.7.0"; + version = "2.7.1"; in buildPythonPackage { inherit version; From 65ac8cfabceeac2658118072942008b8c59ff610 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 23:20:11 +0200 Subject: [PATCH 29/41] python3Packages.torchaudio: 2.7.0 -> 2.7.1 Diff: https://github.com/pytorch/audio/compare/v2.7.0...v2.7.1 Changelog: https://github.com/pytorch/audio/releases/tag/v2.7.1 --- .../python-modules/torchaudio/bin.nix | 2 +- .../torchaudio/binary-hashes.nix | 92 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix index b6c3cda5e7a5..d85afea91385 100644 --- a/pkgs/development/python-modules/torchaudio/bin.nix +++ b/pkgs/development/python-modules/torchaudio/bin.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "torchaudio"; - version = "2.7.0"; + version = "2.7.1"; format = "wheel"; src = diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix index 628c0eb8d700..da82062146cb 100644 --- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix +++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "2.7.0" = { + "2.7.1" = { x86_64-linux-39 = { - name = "torchaudio-2.7.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-DppKLE9UPO/voB3UD0nExEBvve0KcpWpkVgnZ4NFeQ8="; + name = "torchaudio-2.7.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-DBRNX/tO7IbHn/ETar2RvT+DfzBCcTeV4QdYrtxC3Og="; }; x86_64-linux-310 = { - name = "torchaudio-2.7.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-1itum3kq03r20SibooPhAp5xtP+c08bPfw53dvIyVLI="; + name = "torchaudio-2.7.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-K6CBbu5lnjQ4UanF3GDI4euBmjlpspJo+rJ9MUMnPXg="; }; x86_64-linux-311 = { - name = "torchaudio-2.7.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-lB9ZwDc5DiiLznmPnOU9wXuJT3B/f0a1C6OqHDFE0oM="; + name = "torchaudio-2.7.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-hOxyfx/a/fhd0cAYptO/q+tWZbEOC18nOmdetzD1nOU="; }; x86_64-linux-312 = { - name = "torchaudio-2.7.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-G/R44k6Uqkm2gua2q0gZmMtULQb3faqar8ks7daiESc="; + name = "torchaudio-2.7.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-DB1Af5NNRPh5NbE5mR2IcvgfiPimvpt70lkYv3ROK+Y="; }; x86_64-linux-313 = { - name = "torchaudio-2.7.0-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-TgfEDMFF6GS6I5n9+27t78aC9kYk8rjYv1ZwPDEBAFw="; + name = "torchaudio-2.7.1-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchaudio-2.7.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-fpfqil1eVhCNHAcUFmE7xhoONTHC5rpqm2RiMtbkEIg="; }; aarch64-darwin-39 = { - name = "torchaudio-2.7.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-DUIaoiW5NWTJjTuhbxlg3uLtyLTjdfYlGftR4sSJwSM="; + name = "torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-oHEA/iz3r0+mnYywRqK3QEZhJiGhpUivpa8caeAur4E="; }; aarch64-darwin-310 = { - name = "torchaudio-2.7.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-HEpkbJ6TR4NsCell7rxY3QKOxu80xG0+eJG//Y3GReo="; + name = "torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-RzmvV9DrlDR9HGobVmi+eKc4Ov6Cbd4YoEiDufnyY7E="; }; aarch64-darwin-311 = { - name = "torchaudio-2.7.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-hi2cXP4VaIp4RpYrXTyflZvv/oKx5UQZNcejdQTFxec="; + name = "torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-1aYviMYpA1kT9QbfA/cQxI/Iu5Y3GRkz8nxnCI1coTY="; }; aarch64-darwin-312 = { - name = "torchaudio-2.7.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-ZbT8m38oNn+RiwKuTbQpBFe8T90WDyK31oTpOrjcuVY="; + name = "torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-kwbc/EWGzr12R6k/6aRI55HE+Dk02mFrlDO3VZeh+Xg="; }; aarch64-darwin-313 = { - name = "torchaudio-2.7.0-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-FQ+95B2mApbv/tdyt6Fw9WPNRJZ1VauwYD/Fc/Oc4kU="; + name = "torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-5fBZmlB/RoNUaHjtlmfhsy18o8ipV+TBXGswI3jvTe4="; }; aarch64-linux-39 = { - name = "torchaudio-2.7.0-cp39-cp39-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-DopLBfFZ/7qBB5ic3vKKqyaWMH88f3i7nS4K9z7smAo="; + name = "torchaudio-2.7.1-cp39-cp39-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-6LLaEaf3eCsAuCPJnoEusA7os0Va1HT4/UKg2gvE9Go="; }; aarch64-linux-310 = { - name = "torchaudio-2.7.0-cp310-cp310-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-nkBzmS9PjnET5LUF2VCVNhzrLyHde5MQd2FgokJm+PY="; + name = "torchaudio-2.7.1-cp310-cp310-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-wInb/BTF9HCRt78/a/K7rJO4ZhkpnQTZwQL0rVN1iZA="; }; aarch64-linux-311 = { - name = "torchaudio-2.7.0-cp311-cp311-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-Z3vTIDExDuc6R9buvC5050wc9GeTKUXuiAgqOTW1yVA="; + name = "torchaudio-2.7.1-cp311-cp311-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-U7xLoS50aL40p8ou6DfuXIvVdVslwS9mWvkznK434mU="; }; aarch64-linux-312 = { - name = "torchaudio-2.7.0-cp312-cp312-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-MwBO1H8Y8ABEyX7ozZ4/XhwuJu8j1PcrXxrjPmGCWHs="; + name = "torchaudio-2.7.1-cp312-cp312-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-1mvXayJv3UE1yXZQ4bfrY/t2WbTtDjp3iJjkHbuiG2E="; }; aarch64-linux-313 = { - name = "torchaudio-2.7.0-cp313-cp313-manylinux2014_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.0-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-nZIe6wNlEqh+/eAHl3snvTJjIM181fQxlYJBc/6C6Ig="; + name = "torchaudio-2.7.1-cp313-cp313-manylinux2014_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchaudio-2.7.1-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-Jx9xeETlx/ngXIMo3oF7+Q9G2DKBx5HpT1TU7eovWBc="; }; }; } From 02e6ed21fb6024c2c571bbb57cd3efe84ea879f8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 23:21:58 +0200 Subject: [PATCH 30/41] python3Packages.torchvision: 0.22.0 -> 0.22.1 Diff: https://github.com/pytorch/vision/compare/v0.22.0...v0.22.1 Changelog: https://github.com/pytorch/vision/releases/tag/v0.22.1 --- .../python-modules/torchvision/bin.nix | 2 +- .../torchvision/binary-hashes.nix | 92 +++++++++---------- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix index eccd53ebdb5a..1e2d08b4b36c 100644 --- a/pkgs/development/python-modules/torchvision/bin.nix +++ b/pkgs/development/python-modules/torchvision/bin.nix @@ -23,7 +23,7 @@ let pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; srcs = import ./binary-hashes.nix version; unsupported = throw "Unsupported system"; - version = "0.22.0"; + version = "0.22.1"; in buildPythonPackage { inherit version; diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix index 8d708b474fd9..6457b1621cd8 100644 --- a/pkgs/development/python-modules/torchvision/binary-hashes.nix +++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix @@ -7,81 +7,81 @@ version: builtins.getAttr version { - "0.22.0" = { + "0.22.1" = { x86_64-linux-39 = { - name = "torchvision-0.22.0-cp39-cp39-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; - hash = "sha256-ySo1P/gtszEmRLWybUELWGtylptTWUjVhMJHVp91YFw="; + name = "torchvision-0.22.1-cp39-cp39-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl"; + hash = "sha256-UfJbwdKLA32YoUFckXRBcmJE2KAJcZB+bfsA7MwxNl8="; }; x86_64-linux-310 = { - name = "torchvision-0.22.0-cp310-cp310-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; - hash = "sha256-Wd9aVQETqAzlIwRwZuqu2xaMaUgtqIw6skZxarRboJI="; + name = "torchvision-0.22.1-cp310-cp310-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl"; + hash = "sha256-U49NtmcobZObTu4KZtMe0htRGGZoAGsOD/4gM47MfgA="; }; x86_64-linux-311 = { - name = "torchvision-0.22.0-cp311-cp311-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; - hash = "sha256-86xSfVi0wgQ+uNnin8Vs0XUfNvKqptx1407FTJUby5w="; + name = "torchvision-0.22.1-cp311-cp311-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl"; + hash = "sha256-klaKxGsTqMiLYViYALG5xGKb4JHqfOCA/G/GIuEeCRU="; }; x86_64-linux-312 = { - name = "torchvision-0.22.0-cp312-cp312-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; - hash = "sha256-BsEB9A4f+UhpvhRIfJH9U1LjdvIC/er7j1PFjO4vvrU="; + name = "torchvision-0.22.1-cp312-cp312-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl"; + hash = "sha256-9k75u5HXGrNdg4SRKhn3QZ41koaFvGdUTVj0UUgzQ3M="; }; x86_64-linux-313 = { - name = "torchvision-0.22.0-cp313-cp313-linux_x86_64.whl"; - url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; - hash = "sha256-7k+m1AUtmuJcEjMomUf7+kuI0jcQJUqxdysQjB/F+00="; + name = "torchvision-0.22.1-cp313-cp313-linux_x86_64.whl"; + url = "https://download.pytorch.org/whl/cu128/torchvision-0.22.1%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl"; + hash = "sha256-vE/vGTkXtR22tAms0//eyShth3uqwK7l3Pu3JZLQC/w="; }; aarch64-darwin-39 = { - name = "torchvision-0.22.0-cp39-cp39-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp39-cp39-macosx_11_0_arm64.whl"; - hash = "sha256-LvOKOX8bnPYoRvsgZZy5kQH502HejEXXkoTuRcb0DVA="; + name = "torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-macosx_11_0_arm64.whl"; + hash = "sha256-i+lBtNNcCrqBm+cP27vtjOtgQBzmmWuM+quhMAzmImM="; }; aarch64-darwin-310 = { - name = "torchvision-0.22.0-cp310-cp310-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp310-cp310-macosx_11_0_arm64.whl"; - hash = "sha256-ciVvHX/1ELFsn7TdSIWE0Gk/QMeS8oapYgZ0Q4qBzMo="; + name = "torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-macosx_11_0_arm64.whl"; + hash = "sha256-O0fYNp7laMBneVwNoLQHjzmp3+pvO8HzrIdTDf2h3VY="; }; aarch64-darwin-311 = { - name = "torchvision-0.22.0-cp311-cp311-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp311-cp311-macosx_11_0_arm64.whl"; - hash = "sha256-GR6igyH8Ji2Koaf+ecQf8oSIZL84L59upFxB3egxN5I="; + name = "torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-macosx_11_0_arm64.whl"; + hash = "sha256-St32JuK1f8Iv1tMpzxNG1HRJdnLmr4ODt7W2NvupSlM="; }; aarch64-darwin-312 = { - name = "torchvision-0.22.0-cp312-cp312-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp312-cp312-macosx_11_0_arm64.whl"; - hash = "sha256-McMWVBj+IcPYH+NFnlEHfC+UiAG4kz7RgWn1RlJ5ag8="; + name = "torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-macosx_11_0_arm64.whl"; + hash = "sha256-FT8XkOUFvW2hI+Ie7m6D4uFV3wXA/n1WNHMDBn2FQ8U="; }; aarch64-darwin-313 = { - name = "torchvision-0.22.0-cp313-cp313-macosx_11_0_arm64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp313-cp313-macosx_11_0_arm64.whl"; - hash = "sha256-7OF5lYV90yhIXJwCfAsg/8UtsjLjDIT/bJWrdyAREsU="; + name = "torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-macosx_11_0_arm64.whl"; + hash = "sha256-nDrjMZYkxDzIEnAg9GwUqoeEBngfCJm7YoOuR0r+r78="; }; aarch64-linux-39 = { - name = "torchvision-0.22.0-cp39-cp39-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp39-cp39-manylinux_2_28_aarch64.whl"; - hash = "sha256-QJX6wrLkmpww9wHgnsG989EbHkiwBqdqkBWi7Ys5VW4="; + name = "torchvision-0.22.1-cp39-cp39-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp39-cp39-manylinux_2_28_aarch64.whl"; + hash = "sha256-FUor3DehYSLCAk8vd+ZfWYYCC0DAE1FcaUtdNX+smaE="; }; aarch64-linux-310 = { - name = "torchvision-0.22.0-cp310-cp310-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp310-cp310-manylinux_2_28_aarch64.whl"; - hash = "sha256-gQ6krzvGPPOeg0+R9CGP9ZmSccqv/iRWJH35BQAr1sA="; + name = "torchvision-0.22.1-cp310-cp310-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp310-cp310-manylinux_2_28_aarch64.whl"; + hash = "sha256-mQ3k1lekHtcWgM2L4umOvKtVNx8wmT3JvS5nZEH3GA4="; }; aarch64-linux-311 = { - name = "torchvision-0.22.0-cp311-cp311-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp311-cp311-manylinux_2_28_aarch64.whl"; - hash = "sha256-bFYg4Q/+OI629HRJYhBu188VCNJub9+gwQUi0ySa6iQ="; + name = "torchvision-0.22.1-cp311-cp311-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp311-cp311-manylinux_2_28_aarch64.whl"; + hash = "sha256-i0pTpgZ9Y626DFLyuN0ikNtknWQgIWdO5DwMki8Mamk="; }; aarch64-linux-312 = { - name = "torchvision-0.22.0-cp312-cp312-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp312-cp312-manylinux_2_28_aarch64.whl"; - hash = "sha256-jxFryC4MB25wund25hHtOSuWZqpENmLmh4CLCJk9Jq8="; + name = "torchvision-0.22.1-cp312-cp312-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp312-cp312-manylinux_2_28_aarch64.whl"; + hash = "sha256-lkQU7vGUWdVaEOiG4vylBndVDiQ1htFnj2Xj9va6xHo="; }; aarch64-linux-313 = { - name = "torchvision-0.22.0-cp313-cp313-linux_aarch64.whl"; - url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.0-cp313-cp313-manylinux_2_28_aarch64.whl"; - hash = "sha256-Rxxt11u5hMbr5PYDIolKKQvz1LGV52nYB1TzaJzX8jg="; + name = "torchvision-0.22.1-cp313-cp313-linux_aarch64.whl"; + url = "https://download.pytorch.org/whl/cpu/torchvision-0.22.1-cp313-cp313-manylinux_2_28_aarch64.whl"; + hash = "sha256-SmFKakCNLtdCCNDqbCii+7aCkOmn3yBsX+8/C2hl0wc="; }; }; } From 2a773a1b68b49d02efe02c9f0639d8aa4ffc1fd8 Mon Sep 17 00:00:00 2001 From: emaryn Date: Thu, 5 Jun 2025 09:44:02 +0800 Subject: [PATCH 31/41] zasm: 4.4.7 -> 4.4.17 Diff: https://github.com/megatokio/zasm/compare/4.4.7...4.4.17 --- pkgs/by-name/za/zasm/package.nix | 39 +++++++++++++------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pkgs/by-name/za/zasm/package.nix b/pkgs/by-name/za/zasm/package.nix index 0eaf0992e6f6..c813b9827edc 100644 --- a/pkgs/by-name/za/zasm/package.nix +++ b/pkgs/by-name/za/zasm/package.nix @@ -4,24 +4,17 @@ fetchFromGitHub, zlib, }: -let - libs-src = fetchFromGitHub { - owner = "megatokio"; - repo = "Libraries"; - # 2021-02-02 - rev = "c5cb3ed512c677db6f33e2d3539dfbb6e547030b"; - sha256 = "sha256-GiplhZf640uScVdKL6E/fegOgtC9SE1xgBqcX86XADk="; - }; -in -stdenv.mkDerivation rec { + +stdenv.mkDerivation (finalAttrs: { pname = "zasm"; - version = "4.4.7"; + version = "4.4.17"; src = fetchFromGitHub { owner = "megatokio"; repo = "zasm"; - rev = version; - sha256 = "sha256-Zbno8kmzss1H2FjwzHB4U7UXxa6oDfsPV80MVVFfM68="; + tag = finalAttrs.version; + fetchSubmodules = true; + hash = "sha256-nc8hlGfix9eVTP5ZimmLKv22cdfsKRfrG70brpUh6CA="; postFetch = '' # remove folder containing files with weird names (causes the hash to turn out differently under macOS vs. Linux) rm -rv $out/Test @@ -30,10 +23,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - configurePhase = '' - ln -sf ${libs-src} Libraries - ''; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" @@ -42,16 +31,20 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin zasm + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Z80 / 8080 / Z180 assembler (for unix-style OS)"; mainProgram = "zasm"; homepage = "https://k1.spdns.de/Develop/Projects/zasm/Distributions/"; - license = licenses.bsd2; - maintainers = [ maintainers.turbomack ]; - platforms = platforms.unix; - badPlatforms = platforms.aarch64; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.turbomack ]; + platforms = lib.platforms.unix; + badPlatforms = lib.platforms.aarch64; }; -} +}) From 0a00db6f7bb5edbab3e8d9f4bbae8acf6195b5ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 04:06:14 +0000 Subject: [PATCH 32/41] ripunzip: 2.0.2 -> 2.0.3 --- pkgs/by-name/ri/ripunzip/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 9ffa2846b826..da841ffd31de 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU="; + hash = "sha256-giNaTALPZYOfQ+kPyQufbRTdTwwKLK7iDvg50YNfzDg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs="; + cargoHash = "sha256-uz07yZBkmBTEGB64rhBYQ2iL0KbrY4UAM96utv8HCSE="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From f633b66c34008394626e708cf0fc820b4905646a Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 5 Jun 2025 11:31:48 +0800 Subject: [PATCH 33/41] vivaldi: 7.4.3684.43 -> 7.4.3684.46 --- pkgs/by-name/vi/vivaldi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vivaldi/package.nix b/pkgs/by-name/vi/vivaldi/package.nix index b03a862c7713..70a9d9c87ce2 100644 --- a/pkgs/by-name/vi/vivaldi/package.nix +++ b/pkgs/by-name/vi/vivaldi/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.4.3684.43"; + version = "7.4.3684.46"; suffix = { @@ -79,8 +79,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-/Zmxwm65HjIL/JdWJtvcgxk4Bj4VcTXr/px6eCJHy0I="; - x86_64-linux = "sha256-tDGoew5jEOqoHIHSvoOsBcuEzq817YT0pFSO3Li48OU="; + aarch64-linux = "sha256-vcTuqCZy0OlfO5Iz06QVGJRtT3L55wWdmE9R6Y3P1/k="; + x86_64-linux = "sha256-uD2CZ4OEZbLIDgl3VGdHwr0edyJd4Gv/C22Z5wQMYk8="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 195e553ea6f785d55d27346d25a721c015b03ca0 Mon Sep 17 00:00:00 2001 From: vinylen Date: Thu, 5 Jun 2025 07:18:55 +0200 Subject: [PATCH 34/41] vimPlugins.kanso-nvim: init at 2025-06-03 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e7415ee7d925..4c41f43d7063 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6652,6 +6652,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + kanso-nvim = buildVimPlugin { + pname = "kanso.nvim"; + version = "2025-06-03"; + src = fetchFromGitHub { + owner = "webhooked"; + repo = "kanso.nvim"; + rev = "d5975aa93bc157cfc60d4863d0704ab1d6e4deca"; + sha256 = "17faa8mk90ch2s774lrvf17r4461askvv64b0ls95b9ilps9vl4j"; + }; + meta.homepage = "https://github.com/webhooked/kanso.nvim/"; + meta.hydraPlatforms = [ ]; + }; + kdl-vim = buildVimPlugin { pname = "kdl.vim"; version = "2023-02-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 55b9fddd28d7..5f3dcded1e6f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -510,6 +510,7 @@ https://github.com/JuliaEditorSupport/julia-vim/,, https://github.com/GCBallesteros/jupytext.nvim/,HEAD, https://github.com/thesimonho/kanagawa-paper.nvim/,HEAD, https://github.com/rebelot/kanagawa.nvim/,, +https://github.com/webhooked/kanso.nvim/,HEAD, https://github.com/imsnif/kdl.vim/,HEAD, https://github.com/anuvyklack/keymap-layer.nvim/,HEAD, https://github.com/mikesmithgh/kitty-scrollback.nvim/,HEAD, From 90071e65fb2ba240224967e8f3ceb2db8e43c9d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 05:42:13 +0000 Subject: [PATCH 35/41] safety-cli: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/safety/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 50bd8ce07b5f..020178ff3c14 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "safety"; - version = "3.5.1"; + version = "3.5.2"; pyproject = true; src = fetchFromGitHub { owner = "pyupio"; repo = "safety"; tag = version; - hash = "sha256-ZUtx0pOBYPWJDy/xM4A71w+7OzFEkmKxgXtudu2oaUo="; + hash = "sha256-kYGoJpFkZo4kZmbmak/+nOS2gzDO/xAwfbcGPOFxyrY="; }; patches = [ From 6a42e78cc3be97f53ee4307c3c79bfaca4c02ece Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 5 Jun 2025 09:34:37 +0200 Subject: [PATCH 36/41] uv: 0.7.10 -> 0.7.11 Diff: https://github.com/astral-sh/uv/compare/refs/tags/0.7.10...refs/tags/0.7.11 Changelog: https://github.com/astral-sh/uv/blob/0.7.11/CHANGELOG.md --- pkgs/by-name/uv/uv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 495c48f73f87..9b474a97c1ec 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uv"; - version = "0.7.10"; + version = "0.7.11"; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; tag = finalAttrs.version; - hash = "sha256-NdePwYsAIphAJxtD+sCC7vSouWt+i+uPEp+b0zRlLg0="; + hash = "sha256-kDcB1uH5cOjPkSb1NrKBkoHYdE6/V6xaZn8c7QzQQxY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-vPs6VwhnMsnoTpktdLlOdYcw1X35xN/alwZ5zEyHmEY="; + cargoHash = "sha256-9O7XSicZwEuuT3dlaUPHx9he1kBFlZW5EK6FZPJ53uA="; buildInputs = [ rust-jemalloc-sys From b5fa3b319dd9bcb17ff1d279863e571189b443df Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Wed, 4 Jun 2025 23:21:22 +0300 Subject: [PATCH 37/41] teleport_17: 17.4.8 -> 17.5.1 Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.5.0 https://github.com/gravitational/teleport/releases/tag/v17.5.1 Diff: https://github.com/gravitational/teleport/compare/v17.4.8...v17.5.1 --- pkgs/by-name/te/teleport/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix index 4cce72857609..58a6caf352dc 100644 --- a/pkgs/by-name/te/teleport/package.nix +++ b/pkgs/by-name/te/teleport/package.nix @@ -21,9 +21,9 @@ withRdpClient ? true, - version ? "17.4.8", - hash ? "sha256-BMiV4xMDy/21B2kl/vkXD14LKQ9t/qj6K8HFnU9Td7w=", - vendorHash ? "sha256-/JP0/4fFdCuDFLQ+mh7CQNMJ4n3yDNyvnLfbmRl/TBA=", + version ? "17.5.1", + hash ? "sha256-+9Oit7GAUTNv5Z8ZDOuBBRnVvtdA9N0X97UJbLILX50=", + vendorHash ? "sha256-yeouUrLMfkKSYnS9va59cYWnGCvQatQQrNa1DuHQMug=", extPatches ? [ ], cargoHash ? "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=", pnpmHash ? "sha256-TZb1nABTbR+SPgykc/KMRkHW7oLawem6KWmdOFAbLbk=", From 453d0a30a40139ea549418073939f835e398374f Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 5 Jun 2025 09:50:40 +0000 Subject: [PATCH 38/41] clorinde: 0.15.2 -> 0.16.0 --- pkgs/by-name/cl/clorinde/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clorinde/package.nix b/pkgs/by-name/cl/clorinde/package.nix index f56be8024eef..3eed4fed07e1 100644 --- a/pkgs/by-name/cl/clorinde/package.nix +++ b/pkgs/by-name/cl/clorinde/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clorinde"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "halcyonnouveau"; repo = "clorinde"; tag = "clorinde-v${finalAttrs.version}"; - hash = "sha256-CrgJtgFX5RBNfFFr2ZZ0d3oKfryyLAHva7g2JyBFiB8="; + hash = "sha256-ze/PEML1buh3HlVgz6ifMPWfZnr6eT3VpIXf7jR68jw="; }; useFetchCargoVendor = true; - cargoHash = "sha256-jUtkhOAosrxHGRbAdzdrgLzL5Xp2YhxcrG/dcwUhdLg="; + cargoHash = "sha256-dp5m/PLVG8xUM6LCq48NKK0P8di44keB/YZ9ocfL0Bg="; cargoBuildFlags = [ "--package=clorinde" ]; From 1ecc3eb32e391ec6f3764f1f18cd771e4836511c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 10:55:39 +0000 Subject: [PATCH 39/41] vscode-extensions.coder.coder-remote: 1.9.0 -> 1.9.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c84c7e57aaf9..3bc677bdf632 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1018,8 +1018,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.9.0"; - hash = "sha256-34Qu6BOQIbTsPeIGCp8Lcsz+FoDrP36PuYpX/4mqpvw="; + version = "1.9.1"; + hash = "sha256-Fsh95lMNliag5TV5MWSAs4Z3npj74mrCmaLSztbpH0I="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; From 262ceea379765a7f9ea0ef0bfc4500e04b7c6e3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 11:01:21 +0000 Subject: [PATCH 40/41] vscode-extensions.ms-windows-ai-studio.windows-ai-studio: 0.14.0 -> 0.14.3 --- .../ms-windows-ai-studio.windows-ai-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 5a0f77583f56..91b52c9f4065 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "0.14.0"; - hash = "sha256-qfEPvDHYjFWT+NMN6jlouRljtTflKOqn2wHL83tnUi0="; + version = "0.14.3"; + hash = "sha256-0wXgHr5M/HEMFgZFQlwJ/WDJLJG+o0cPj4cxiQuTFE8="; }; meta = { From 6c76fd5f512e3225ecff578ded7cbe74347253cc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 1 Jun 2025 14:46:22 +0200 Subject: [PATCH 41/41] sane-backends: more accurate systemd support check As opposed to conditioning it on isLinux. --- pkgs/applications/graphics/sane/backends/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 2777e107511a..da5ebb101fc2 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -18,6 +18,7 @@ net-snmp, curl, systemd, + withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, libxml2, poppler, gawk, @@ -111,6 +112,8 @@ stdenv.mkDerivation rec { libieee1284 libv4l net-snmp + ] + ++ lib.optionals withSystemd [ systemd ];