From 61990c13bc7c3b4587bf2509be6c891922eaffd9 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 19 Aug 2025 03:25:10 -0600 Subject: [PATCH 01/81] python3Packages.ipython-sql: fix build --- pkgs/development/python-modules/ipython-sql/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ipython-sql/default.nix b/pkgs/development/python-modules/ipython-sql/default.nix index a65eac31eb3c..bf4430c3e6ce 100644 --- a/pkgs/development/python-modules/ipython-sql/default.nix +++ b/pkgs/development/python-modules/ipython-sql/default.nix @@ -2,11 +2,11 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, setuptools, ipython, ipython-genutils, prettytable, + six, sqlalchemy, sqlparse, }: @@ -15,19 +15,18 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { inherit pname version; hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ipython ipython-genutils prettytable + six sqlalchemy sqlparse ]; From e7b0cea4e74b85340a749a1ac26825a6e29f8683 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 19 Aug 2025 03:42:29 -0600 Subject: [PATCH 02/81] python3Packages.nxt-python: modernize, fix build --- .../python-modules/nxt-python/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index bbe611db0734..655f9c10e481 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -5,8 +5,8 @@ poetry-core, pybluez, pytestCheckHook, - pythonOlder, pyusb, + pillow, }: buildPythonPackage rec { @@ -14,8 +14,6 @@ buildPythonPackage rec { version = "3.5.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "schodet"; repo = "nxt-python"; @@ -25,7 +23,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - dependencies = [ pyusb ]; + dependencies = [ + pyusb + pillow + ]; optional-dependencies = { bluetooth = [ pybluez ]; @@ -35,11 +36,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "nxt" ]; - meta = with lib; { + meta = { description = "Python driver/interface for Lego Mindstorms NXT robot"; homepage = "https://github.com/schodet/nxt-python"; changelog = "https://github.com/schodet/nxt-python/releases/tag/${src.tag}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ibizaman ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ibizaman ]; }; } From a4f7a0696c881e145726bf02a262c4f5001d3422 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 29 Aug 2025 01:54:54 +0900 Subject: [PATCH 03/81] ipamjfont: init at 006.01 --- pkgs/by-name/ip/ipamjfont/package.nix | 63 +++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 pkgs/by-name/ip/ipamjfont/package.nix diff --git a/pkgs/by-name/ip/ipamjfont/package.nix b/pkgs/by-name/ip/ipamjfont/package.nix new file mode 100644 index 000000000000..1f11aa4f7df0 --- /dev/null +++ b/pkgs/by-name/ip/ipamjfont/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenvNoCC, + fetchzip, + writeShellApplication, + curl, + gnugrep, + common-updater-scripts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "ipamjfont"; + version = "006.01"; + + src = + let + suffix = lib.strings.replaceString "." "" finalAttrs.version; + in + fetchzip { + url = "https://dforest.watch.impress.co.jp/library/i/ipamjfont/10750/ipamjm${suffix}.zip"; + hash = "sha256-Rft8hmxm3D4hOaLaSYDfD14oarDIHUQkMZX+/ZDD4m0="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -Dm444 *.ttf -t "$out/share/fonts/truetype/" + + runHook postInstall + ''; + + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "${finalAttrs.pname}-updater"; + + runtimeInputs = [ + curl + gnugrep + common-updater-scripts + ]; + + text = '' + suffix="$( + curl --fail --silent 'https://forest.watch.impress.co.jp/library/software/ipamjfont/download_10750.html' | \ + grep --perl-regexp --only-matching 'meta.+?ipamjm\K[0-9]+' + )" + version="''${suffix:0:3}.''${suffix:3:2}" + update-source-version '${finalAttrs.pname}' "$version" --ignore-same-version --print-changes + ''; + }); + }; + + meta = { + description = "Japanese Mincho font implementing IVS compliant with Hanyo-Denshi collection"; + downloadPage = "https://forest.watch.impress.co.jp/library/software/ipamjfont/"; + homepage = "https://moji.or.jp/mojikiban/font/"; + license = lib.licenses.ipa; + maintainers = with lib.maintainers; [ + kachick + ]; + }; +}) From 4238e9a0693499a75babfaaf608506c30afaeda5 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 17 Sep 2025 22:50:57 -0400 Subject: [PATCH 04/81] zeno: init at 2.0.15 --- pkgs/by-name/ze/zeno/package.nix | 41 ++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/ze/zeno/package.nix diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix new file mode 100644 index 000000000000..fb0eee22c3cf --- /dev/null +++ b/pkgs/by-name/ze/zeno/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, +}: +buildGoModule (finalAttrs: { + pname = "zeno"; + version = "2.0.15"; + + src = fetchFromGitHub { + owner = "internetarchive"; + repo = "Zeno"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NLvpPM5AQx4svAFrZ+be+Xr0bErOg3Q8y2YxdpX9lYs="; + }; + + vendorHash = "sha256-sUd4rRq5KEbdj5Z6igmDeN1E2q9NXgyed0F4hW8De6E="; + + env.CGO_ENABLED = true; + ldFlags = [ + "-s" + "-w" + ]; + + # Attempts to access internet + doCheck = false; + + meta = { + description = "State-of-the-art web crawler"; + longDescription = '' + Zeno is a web crawler designed to operate wide crawls or to simply + archive one web page. Zeno's key concepts are: portability, + performance, simplicity. With an emphasis on performance. + ''; + homepage = "https://github.com/internetarchive/Zeno"; + changelog = "https://github.com/internetarchive/Zeno/releases/tag/v${finalAttrs.version}"; + mainProgram = "Zeno"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.RossSmyth ]; + }; +}) From 55aa9762d0518417c21df6df53cedd9dcdbe53c7 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Sat, 27 Sep 2025 13:17:46 -0600 Subject: [PATCH 05/81] scrcpy: 3.3.2 -> 3.3.3 https://github.com/Genymobile/scrcpy/releases/tag/v3.3.3 Diff: https://github.com/Genymobile/scrcpy/compare/v3.3.2...v3.3.3 --- pkgs/by-name/sc/scrcpy/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index cb0e61c09cde..468f5ad94dcf 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -7,7 +7,6 @@ meson, ninja, pkg-config, - runtimeShell, installShellFiles, android-tools, @@ -17,12 +16,12 @@ }: let - version = "3.3.2"; + version = "3.3.3"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-LuXKCGPvRA9bfHWFa7R1xSg9CoNZyzcLHBYTFP0p39k="; + hash = "sha256-fnAyO6fyWWSd1KzOl6xP77roECssbZHi575hP9U1S+A="; }; in stdenv.mkDerivation rec { @@ -33,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; tag = "v${version}"; - hash = "sha256-rwEsJlYlOIdgQfniAXdE2sg0WdI1ZxWxZV6MTFQoueg="; + hash = "sha256-1kCAqb/12fkKlp9MOsgw9ukp0lwJqTxD0gWN0IqvQJQ="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. @@ -69,10 +68,6 @@ stdenv.mkDerivation rec { # runtime dep on `adb` to push the server wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace $out/share/applications/scrcpy-console.desktop \ - --replace "/bin/bash" "${runtimeShell}" ''; meta = { From 3e0b6a66e0d5a461dd88627b9d684770a2a15a02 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Oct 2025 23:44:26 +0000 Subject: [PATCH 06/81] alacarte: 3.56.0 -> 3.58.0 --- pkgs/by-name/al/alacarte/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix index 697494c31942..0a0bf87c16ce 100644 --- a/pkgs/by-name/al/alacarte/package.nix +++ b/pkgs/by-name/al/alacarte/package.nix @@ -17,14 +17,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "alacarte"; - version = "3.56.0"; + version = "3.58.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "alacarte"; tag = version; - hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg="; + hash = "sha256-U3shnQ1GlDvOQFfjYVfAhCVRVQpTyLwEzHqKIbBChas="; }; format = "other"; From 78c55fd4fced0a6087e6f04e6df53b252441e538 Mon Sep 17 00:00:00 2001 From: Austin Eschweiler Date: Thu, 2 Oct 2025 15:11:38 -0500 Subject: [PATCH 07/81] maintainers: add esch --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6cc33320fa91..85a7a58e8690 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7846,6 +7846,12 @@ githubId = 21313906; name = "EsAu"; }; + esch = { + name = "Austin Eschweiler"; + github = "Eschguy"; + githubId = 8880292; + email = "austin.eschweiler@gmail.com"; + }; esclear = { github = "esclear"; githubId = 7432848; From b48e11d1408457ce496e215dd388387f75ff56b7 Mon Sep 17 00:00:00 2001 From: Austin Eschweiler Date: Thu, 2 Oct 2025 21:06:26 -0500 Subject: [PATCH 08/81] tts-mod-vault: init 1.3.0 --- pkgs/by-name/tt/tts-mod-vault/package.nix | 47 + .../tt/tts-mod-vault/pubspec.lock.json | 1278 +++++++++++++++++ 2 files changed, 1325 insertions(+) create mode 100644 pkgs/by-name/tt/tts-mod-vault/package.nix create mode 100644 pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json diff --git a/pkgs/by-name/tt/tts-mod-vault/package.nix b/pkgs/by-name/tt/tts-mod-vault/package.nix new file mode 100644 index 000000000000..4f0e5c19a2ac --- /dev/null +++ b/pkgs/by-name/tt/tts-mod-vault/package.nix @@ -0,0 +1,47 @@ +{ + lib, + flutter329, + makeDesktopItem, + copyDesktopItems, + fetchFromGitHub, +}: + +flutter329.buildFlutterApplication rec { + pname = "tts-mod-vault"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "markomijic"; + repo = "TTS-Mod-Vault"; + tag = "v${version}"; + hash = "sha256-BTs+4QeyVJeg415uiNXww8twQwUInHfB8voWJjeVs20="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + desktopItems = [ + (makeDesktopItem { + name = "tts-mod-vault"; + exec = "tts-mod-vault"; + icon = "tts-mod-vault"; + comment = "Tabletop Simulator Mod Vault"; + desktopName = "TTS Mod Vault"; + categories = [ "Utility" ]; + }) + ]; + + nativeBuildInputs = [ copyDesktopItems ]; + + postInstall = '' + install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts-mod-vault.png + ''; + + meta = { + description = "Download and backup assets for your Tabletop Simulator mods"; + homepage = "https://github.com/markomijic/TTS-Mod-Vault"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ esch ]; + mainProgram = "tts-mod-vault"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json new file mode 100644 index 000000000000..8e0693d40d25 --- /dev/null +++ b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json @@ -0,0 +1,1278 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "88.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.1" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.7" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.12.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "bson": { + "dependency": "direct main", + "description": { + "name": "bson", + "sha256": "f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.7" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.0" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.0" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.6" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "decimal": { + "dependency": "transitive", + "description": { + "name": "decimal", + "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.4" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.9.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.3" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_archive": { + "dependency": "direct main", + "description": { + "name": "flutter_archive", + "sha256": "5ca235f304c12bf468979235f400f79846d204169d715939e39197106f5fc970", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "flutter_hooks": { + "dependency": "direct main", + "description": { + "name": "flutter_hooks", + "sha256": "b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.21.2" + }, + "flutter_launcher_icons": { + "dependency": "direct dev", + "description": { + "name": "flutter_launcher_icons", + "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.4" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.30" + }, + "flutter_riverpod": { + "dependency": "transitive", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hive_ce": { + "dependency": "direct main", + "description": { + "name": "hive_ce", + "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.2" + }, + "hive_ce_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_ce_flutter", + "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "hive_ce_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_ce_generator", + "sha256": "8c677690c8ead43778ddf7ed8ff17e852dd5d22d082c75182b072842c0dc5055", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.5" + }, + "hooks_riverpod": { + "dependency": "direct main", + "description": { + "name": "hooks_riverpod", + "sha256": "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.4" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "isolate_channel": { + "dependency": "transitive", + "description": { + "name": "isolate_channel", + "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.8" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.9" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "open_filex": { + "dependency": "direct main", + "description": { + "name": "open_filex", + "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.7.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "packages_extensions": { + "dependency": "transitive", + "description": { + "name": "packages_extensions", + "sha256": "1fb328695a9828c80d275ce1650a2bb5947690070de082dfa1dfac7429378daf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.18" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "power_extensions": { + "dependency": "transitive", + "description": { + "name": "power_extensions", + "sha256": "ad0e8b2420090d996fe8b7fd32cdf02b9b924b6d4fc0fb0b559ff6aa5e24d5b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "rational": { + "dependency": "transitive", + "description": { + "name": "rational", + "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.1" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.8" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.20" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.4" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.3" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.4" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.1" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.3.1" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.13.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_writer": { + "dependency": "transitive", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.0" + } +} From f7a6455cc39fc14ad973bea040764fe31d5f7cb5 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Thu, 9 Oct 2025 16:39:02 +0330 Subject: [PATCH 09/81] pagefind: update wasm-bindgen-cli to 0.2.104 --- .../misc/pagefind/cargo-lock.patch | 86 +++++++++++++++++++ pkgs/applications/misc/pagefind/default.nix | 7 +- .../misc/pagefind/web-cargo-lock.patch | 85 ++++++++++++++++++ 3 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/misc/pagefind/web-cargo-lock.patch diff --git a/pkgs/applications/misc/pagefind/cargo-lock.patch b/pkgs/applications/misc/pagefind/cargo-lock.patch index f0fbd420e61f..d547116b4ba7 100644 --- a/pkgs/applications/misc/pagefind/cargo-lock.patch +++ b/pkgs/applications/misc/pagefind/cargo-lock.patch @@ -279,3 +279,89 @@ "bytes", "futures-util", "http 1.3.1", + +--- a/pagefind_web/Cargo.lock ++++ b/pagefind_web/Cargo.lock +@@ -89,6 +89,12 @@ dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" ++ + [[package]] + name = "syn" + version = "2.0.55" +@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" ++checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", ++ "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" ++checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" + dependencies = [ + "bumpalo", + "log", +- "once_cell", + "proc-macro2", + "quote", + "syn", +@@ -133,9 +141,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" ++checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -143,9 +151,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" ++checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" + dependencies = [ + "proc-macro2", + "quote", +@@ -156,9 +164,12 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" ++checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "write-json" "http 1.3.1", diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index f54060700337..fc7109469d12 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -12,7 +12,7 @@ python3, rustc, versionCheckHook, - wasm-bindgen-cli_0_2_92, + wasm-bindgen-cli_0_2_104, wasm-pack, }: @@ -72,8 +72,9 @@ rustPlatform.buildRustPackage (finalAttrs: { env.cargoDeps_web = rustPlatform.fetchCargoVendor { name = "cargo-deps-web-${finalAttrs.version}"; inherit (finalAttrs) src; + patches = [ ./web-cargo-lock.patch ]; sourceRoot = "${finalAttrs.src.name}/pagefind_web"; - hash = "sha256-DaipINtwePA03YdbSzh6EjH4Q13P3CB9lwcmTOR54dM="; + hash = "sha256-TdbNvDF4WQ2xgkKGVmmZ8R2Wga21OUaGmey/2HVWVcQ="; }; env.npmDeps_web_js = fetchNpmDeps { name = "pagefind-npm-deps-web-js-${finalAttrs.version}"; @@ -165,7 +166,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nodejs rustc rustc.llvmPackages.lld - wasm-bindgen-cli_0_2_92 + wasm-bindgen-cli_0_2_104 wasm-pack ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ diff --git a/pkgs/applications/misc/pagefind/web-cargo-lock.patch b/pkgs/applications/misc/pagefind/web-cargo-lock.patch new file mode 100644 index 000000000000..ee94206800f9 --- /dev/null +++ b/pkgs/applications/misc/pagefind/web-cargo-lock.patch @@ -0,0 +1,85 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -89,6 +89,12 @@ dependencies = [ + "proc-macro2", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" ++ + [[package]] + name = "syn" + version = "2.0.55" +@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" ++checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", ++ "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" ++checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19" + dependencies = [ + "bumpalo", + "log", +- "once_cell", + "proc-macro2", + "quote", + "syn", +@@ -133,9 +141,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" ++checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -143,9 +151,9 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" ++checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7" + dependencies = [ + "proc-macro2", + "quote", +@@ -156,9 +164,12 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.92" ++version = "0.2.104" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" ++checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "write-json" "http 1.3.1", From 506fc845ba418d2a75b6b2d24f9a99d12340c3d6 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Thu, 9 Oct 2025 16:46:03 +0330 Subject: [PATCH 10/81] wasm-bindgen-cli_0_2_92: remove --- .../wa/wasm-bindgen-cli_0_2_92/package.nix | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix deleted file mode 100644 index 3d908a9501ff..000000000000 --- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - buildWasmBindgenCli, - fetchCrate, - rustPlatform, -}: - -buildWasmBindgenCli rec { - src = fetchCrate { - pname = "wasm-bindgen-cli"; - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - inherit (src) pname version; - hash = "sha256-81vQkKubMWaX0M3KAwpYgMA1zUQuImFGvh5yTW+rIAs="; - }; -} From a12a0bbab054ef8c2f8d11bf8394777202159ec7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Oct 2025 01:35:32 +0200 Subject: [PATCH 11/81] python3Packages.swagger-ui-py: init 25.7.1 --- .../python-modules/swagger-ui-py/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/swagger-ui-py/default.nix diff --git a/pkgs/development/python-modules/swagger-ui-py/default.nix b/pkgs/development/python-modules/swagger-ui-py/default.nix new file mode 100644 index 000000000000..248cd4cc08ed --- /dev/null +++ b/pkgs/development/python-modules/swagger-ui-py/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + jinja2, + packaging, + pyyaml, +}: + +buildPythonPackage rec { + pname = "swagger-ui-py"; + version = "25.7.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "PWZER"; + repo = "swagger-ui-py"; + tag = "v${version}"; + hash = "sha256-yPGt7EG8KvGoI7Unz0E7fn7nG9Ei/h8Q3TDKnuVVRkQ="; + }; + + env.VERSION = version; + + build-system = [ + setuptools + ]; + + dependencies = [ + jinja2 + packaging + pyyaml + ]; + + doCheck = false; # huge dependency closure on all sorts of web frameworks, http clients, etc. + + pythonImportsCheck = [ + "swagger_ui" + ]; + + meta = { + changelog = "https://github.com/PWZER/swagger-ui-py/releases/tag/${src.tag}"; + description = "Swagger UI for Python web framework, such Tornado, Flask and Sanic. https://pwzer.github.io/swagger-ui-py"; + homepage = "https://github.com/PWZER/swagger-ui-py"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4703021f89a8..296e9a6e7b5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17905,6 +17905,8 @@ self: super: with self; { swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + swagger-ui-py = callPackage ../development/python-modules/swagger-ui-py { }; + swcgeom = callPackage ../development/python-modules/swcgeom { }; swh-auth = callPackage ../development/python-modules/swh-auth { }; From d433c6fba11950459b959a31dadabcf0dedba170 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 11 Oct 2025 01:14:42 +0200 Subject: [PATCH 12/81] python3Packages.wyoming: 1.7.2 -> 1.8.0 https://github.com/OHF-Voice/wyoming/releases/tag/1.8.0 --- .../python-modules/wyoming/default.nix | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix index 56af4b52e6df..763157aabb28 100644 --- a/pkgs/development/python-modules/wyoming/default.nix +++ b/pkgs/development/python-modules/wyoming/default.nix @@ -7,9 +7,13 @@ setuptools, # optional-dependencies + flask, + swagger-ui-py, zeroconf, # tests + pytest-asyncio, + pytestCheckHook, wyoming-faster-whisper, wyoming-openwakeword, wyoming-piper, @@ -17,35 +21,42 @@ buildPythonPackage rec { pname = "wyoming"; - version = "1.7.2"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { - owner = "rhasspy"; + owner = "OHF-Voice"; repo = "wyoming"; - tag = version; - hash = "sha256-tLwMysBxNPk5ztkwuuOhChhGgY+uEE9uA4S5ZVlVtY0="; + tag = "v${version}"; + hash = "sha256-s1wYGqoTIsKj3u99/9KdKZmzUGzGeYq1TJHOkOVwkHQ="; }; build-system = [ setuptools ]; optional-dependencies = { + http = [ + flask + swagger-ui-py + ]; zeroconf = [ zeroconf ]; }; pythonImportsCheck = [ "wyoming" ]; - # no tests - doCheck = false; + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ] + ++ lib.flatten (lib.attrValues optional-dependencies); passthru.tests = { inherit wyoming-faster-whisper wyoming-openwakeword wyoming-piper; }; meta = with lib; { - changelog = "https://github.com/rhasspy/wyoming/releases/tag/${src.tag}"; + changelog = "https://github.com/OHF-Voice/wyoming/releases/tag/${src.tag}"; description = "Protocol for Rhasspy Voice Assistant"; - homepage = "https://github.com/rhasspy/wyoming"; + homepage = "https://github.com/OHF-Voice/wyoming"; license = licenses.mit; maintainers = with maintainers; [ hexa ]; }; From 7baa2e1792fd5380428223794ab5e19527275c36 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 12 Oct 2025 22:12:52 +0200 Subject: [PATCH 13/81] rPackages.ulex: use pname and version --- pkgs/development/ocaml-modules/ulex/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index ac98285c101f..512be9b782f4 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -27,14 +27,14 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "ulex is not available for OCaml ${ocaml.version}" stdenv.mkDerivation - rec { - name = "ocaml${ocaml.version}-${pname}-${version}"; + { + pname = "ocaml${ocaml.version}-${pname}"; inherit (param) version; src = fetchFromGitHub { - owner = "whitequark"; + owner = "ocaml-community"; repo = pname; - rev = "v${version}"; + rev = "v${param.version}"; inherit (param) sha256; }; @@ -56,7 +56,7 @@ lib.throwIf (lib.versionAtLeast ocaml.version "5.0") ]; meta = { - inherit (src.meta) homepage; + homepage = "https://opam.ocaml.org/packages/ulex/"; description = "Lexer generator for Unicode and OCaml"; license = lib.licenses.mit; inherit (ocaml.meta) platforms; From 843ede398e209da8f28708ffda8cf39a790a2b69 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 11 Oct 2025 13:27:59 -0400 Subject: [PATCH 14/81] python3Packages.sunpy: 7.0.1 -> 7.0.2; unbreak --- .../python-modules/sunpy/default.nix | 194 +++++++++++------- 1 file changed, 120 insertions(+), 74 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index e09eae34658e..e991d99cbab8 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -1,67 +1,103 @@ { lib, - stdenv, asdf, + asdf-astropy, astropy, - astropy-extension-helpers, - astropy-helpers, beautifulsoup4, buildPythonPackage, + contourpy, + dask, drms, - fetchPypi, + extension-helpers, + fetchFromGitHub, + fsspec, glymur, h5netcdf, + h5py, hypothesis, lxml, matplotlib, numpy, + opencv-python, + packaging, pandas, parfive, + pyerfa, pytest-astropy, pytestCheckHook, pytest-mock, python-dateutil, pythonOlder, + reproject, + requests, scikit-image, scipy, + setuptools, setuptools-scm, - sqlalchemy, tqdm, + writableTmpDirAsHomeHook, zeep, }: buildPythonPackage rec { pname = "sunpy"; - version = "7.0.1"; - format = "setuptools"; + version = "7.0.2"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; - src = fetchPypi { - inherit pname version; - hash = "sha256-9ZCG9CtTpgGGlqtXcl2epRBzFcbVvIMzZcXk5CQ5/+A="; + src = fetchFromGitHub { + owner = "sunpy"; + repo = "sunpy"; + tag = "v${version}"; + hash = "sha256-1LT6Dr9OZYIZkOICSYD8lt5v3Gn1gZGN4GWeJL6IH5w="; }; - nativeBuildInputs = [ - astropy-extension-helpers - setuptools-scm + # As of 2025-10-15, this requires numpy >=1.25.0,<2.3. + # (The >=1.25.0 constraint is in dependencies, the <2.3 in build-system) + # We can't use 1.x because it's not supported on Python 3.13+. + # And since numpy 2.x is at 2.3.2, it's not supported. + # However, the upper bound is "for matching the numpy deprecation policy", + # so relaxing it should be OK. (It silently was overridden previously, + # due to the use of `format = "setuptools"` instead of `pyproject = true`) + postPatch = '' + substituteInPlace pyproject.toml --replace-fail "numpy>=2.0.0rc1,<2.3" "numpy" + ''; + + build-system = [ + extension-helpers + setuptools + setuptools-scm # Technically needs setuptools-scm[toml], but that's our default. + numpy ]; - propagatedBuildInputs = [ + dependencies = [ astropy - astropy-helpers + fsspec numpy + packaging parfive - ]; + pyerfa + requests + ] + ++ parfive.optional-dependencies.ftp; optional-dependencies = { asdf = [ asdf - # asdf-astropy + asdf-astropy ]; - database = [ sqlalchemy ]; - image = [ - scikit-image + dask = [ dask ] ++ dask.optional-dependencies.array; + image = [ scipy ]; + jpeg2000 = [ + glymur + lxml + ]; + map = [ + contourpy + matplotlib + # mpl-animators + reproject scipy ]; net = [ @@ -71,93 +107,103 @@ buildPythonPackage rec { tqdm zeep ]; - jpeg2000 = [ - glymur - lxml - ]; + opencv = [ opencv-python ]; + scikit-image = [ scikit-image ]; + # spice = [ spiceypy ]; timeseries = [ # cdflib h5netcdf - # h5py + h5py matplotlib pandas ]; + visualization = [ + matplotlib + # mpl-animators + ]; + + # We can't use `with` here because "map" would still be the builtin, and + # we can't below because scikit-image would still be this package's argument. + core = lib.concatLists [ + optional-dependencies.image + optional-dependencies.map + optional-dependencies.net + optional-dependencies.timeseries + optional-dependencies.visualization + ]; + all = lib.concatLists [ + optional-dependencies.core + optional-dependencies.asdf + optional-dependencies.jpeg2000 + optional-dependencies.opencv + # optional-dependencies.spice + optional-dependencies.scikit-image + ]; }; nativeCheckInputs = [ hypothesis pytest-astropy - pytest-mock pytestCheckHook + pytest-mock + writableTmpDirAsHomeHook ] - ++ optional-dependencies.asdf - ++ optional-dependencies.database - ++ optional-dependencies.image - ++ optional-dependencies.net - ++ optional-dependencies.timeseries; - - postPatch = '' - substituteInPlace setup.cfg \ - --replace " --dist no" "" - ''; - - # darwin has write permission issues - doCheck = stdenv.hostPlatform.isLinux; - - preCheck = '' - export HOME=$(mktemp -d) - ''; + ++ optional-dependencies.all; disabledTests = [ - "rst" - "test_sunpy_warnings_logging" + "rst" # Docs + "test_print_params" # Needs to be online + "test_find_dependencies" # Needs cdflib + # Needs mpl-animators + "sunpy.coordinates.utils.GreatArc" + "test_expand_list_generator_map" + "test_great_arc_different_observer" + "test_great_arc_points_differentiates" + "test_great_arc_wrongly_formatted_points" + "test_main_exclude_remote_data" + "test_main_include_remote_data" "test_main_nonexisting_module" + "test_main_only_remote_data" "test_main_stdlib_module" - "test_find_dependencies" + "test_main_submodule_map" + "test_tai_seconds" + "test_utime" ]; disabledTestPaths = [ # Tests are very slow "sunpy/net/tests/test_fido.py" + "sunpy/net/tests/test_scraper.py" # asdf.extensions plugin issue + "sunpy/io/special/asdf/resources/manifests/*.yaml" "sunpy/io/special/asdf/resources/schemas/" - "sunpy/io/special/asdf/resources/manifests/sunpy-1.0.0.yaml" - # Requires mpl-animators package - "sunpy/map/tests/test_compositemap.py" - "sunpy/map/tests/test_mapbase.py" - "sunpy/map/tests/test_mapsequence.py" - "sunpy/map/tests/test_plotting.py" - "sunpy/map/tests/test_reproject_to.py" - "sunpy/net/tests/test_helioviewer.py" - "sunpy/timeseries/tests/test_timeseriesbase.py" - "sunpy/visualization/animator/tests/test_basefuncanimator.py" - "sunpy/visualization/animator/tests/test_mapsequenceanimator.py" - "sunpy/visualization/animator/tests/test_wcs.py" - "sunpy/visualization/colormaps/tests/test_cm.py" - # Requires cdflib package - "sunpy/timeseries/tests/test_timeseries_factory.py" - # Requires jplephem + # Requires mpl-animators + "sunpy/coordinates/tests/test_wcs_utils.py" + "sunpy/image/tests/test_resample.py" "sunpy/image/tests/test_transform.py" - "sunpy/io/special/asdf/tests/test_coordinate_frames.py" "sunpy/io/special/asdf/tests/test_genericmap.py" - # distutils is deprecated - "sunpy/io/setup_package.py" + "sunpy/map" + "sunpy/net/jsoc/tests/test_jsoc.py" + "sunpy/physics/differential_rotation.py" + "sunpy/physics/tests/test_differential_rotation.py" + "sunpy/visualization" + # Requires cdflib + "sunpy/io/tests/test_cdf.py" + "sunpy/timeseries" + # Requires jplephem + "sunpy/io/special/asdf/tests/test_coordinate_frames.py" + # Requires spiceypy + "sunpy/coordinates/tests/test_spice.py" ]; - pytestFlags = [ - "-Wignore::DeprecationWarning" - ]; + pytestFlags = [ "-Wignore::DeprecationWarning" ]; - # Wants a configuration file - # pythonImportsCheck = [ - # "sunpy" - # ]; + pythonImportsCheck = [ "sunpy" ]; meta = with lib; { description = "Python for Solar Physics"; homepage = "https://sunpy.org"; license = licenses.bsd2; maintainers = [ ]; - broken = true; }; } From fe869e0b47f566564f1cedf942553567010b9710 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 16 Oct 2025 06:31:04 +0800 Subject: [PATCH 15/81] python3Packages.pymbolic: 2024.2.2 -> 2025.1 --- pkgs/development/python-modules/pymbolic/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index a74f61195b14..8be9ffbd8c0e 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -7,8 +7,9 @@ hatchling, # dependencies - immutabledict, + constantdict, pytools, + typing-extensions, # optional-dependencies matchpy, @@ -20,21 +21,22 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2024.2.2"; + version = "2025.1"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "pymbolic"; tag = "v${version}"; - hash = "sha256-07RWdEPhO+n9/FOvIWe4nm9fGekut9X6Tz4HlIkBSpo="; + hash = "sha256-cn2EdhMn5qjK854AF5AY4Hv4M5Ib6gPRJk+kQvsFWRk="; }; build-system = [ hatchling ]; dependencies = [ - immutabledict + constantdict pytools + typing-extensions ]; optional-dependencies = { @@ -51,6 +53,6 @@ buildPythonPackage rec { homepage = "https://documen.tician.de/pymbolic/"; changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ qbisi ]; }; } From e19b94030a2da80a67bb9c2af14779d51b78bcc6 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 16 Oct 2025 06:32:23 +0800 Subject: [PATCH 16/81] python3Packages.firedrake: add dependency immutabledict explicitly --- pkgs/development/python-modules/firedrake/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix index 645bf8ae82ff..4788e344cf05 100644 --- a/pkgs/development/python-modules/firedrake/default.nix +++ b/pkgs/development/python-modules/firedrake/default.nix @@ -36,6 +36,7 @@ sympy, islpy, matplotlib, + immutabledict, # tests pytest, @@ -129,6 +130,8 @@ buildPythonPackage rec { sympy # required by script spydump matplotlib + # required by pyop2 + immutabledict ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ islpy From 697e7ab1544452edb961ab56bb72fcca5a882766 Mon Sep 17 00:00:00 2001 From: Kenichi Kamiya Date: Fri, 26 Sep 2025 15:22:41 +0900 Subject: [PATCH 17/81] rumdl: init at 0.0.156 --- pkgs/by-name/ru/rumdl/package.nix | 66 +++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/ru/rumdl/package.nix diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix new file mode 100644 index 000000000000..e64a26b89c45 --- /dev/null +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -0,0 +1,66 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "rumdl"; + version = "0.0.156"; + + src = fetchFromGitHub { + owner = "rvben"; + repo = "rumdl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-yHOfrX3iOq1oGwHtHchMyQblqLXreoUKLBTpxxh2FEE="; + }; + + cargoHash = "sha256-U8kb3fQjA3Prrpn1KmhsQl4S0hvhcY+5qlqT5ovbUZE="; + + cargoBuildFlags = [ + "--bin=rumdl" + ]; + + __darwinAllowLocalNetworking = true; # required for LSP tests + + useNextest = true; + + cargoTestFlags = [ + "--profile ci" + ]; + + checkFlags = [ + # Skip Windows tests + "--skip comprehensive_windows_tests" + "--skip windows_vscode_tests" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "--version"; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Markdown linter and formatter"; + longDescription = '' + rumdl is a high-performance Markdown linter and formatter + that helps ensure consistency and best practices in your Markdown files. + ''; + homepage = "https://github.com/rvben/rumdl"; + changelog = "https://github.com/rvben/rumdl/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + kachick + hasnep + ]; + mainProgram = "rumdl"; + platforms = with lib.platforms; unix ++ windows; + }; +}) From c62684cfa58963959d9e12c9514c9f92d135c504 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Oct 2025 05:52:44 +0000 Subject: [PATCH 18/81] python3Packages.pyoxigraph: 0.5.0 -> 0.5.1 --- pkgs/development/python-modules/pyoxigraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix index f312cc84afad..c6ae933e46e1 100644 --- a/pkgs/development/python-modules/pyoxigraph/default.nix +++ b/pkgs/development/python-modules/pyoxigraph/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "pyoxigraph"; pyproject = true; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "oxigraph"; repo = "oxigraph"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-Q/wMRDTlz7xH59Mc+G+DOH0GYzE3KYPFvBZtVYVOeQI="; + hash = "sha256-58PGRQlDziVENgm7OKPAzXXi4BkOJqytGCxxIXB2smc="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-qk4NloQU0am8yqoViXZy9TmGvQ6RJt3otzaVugoF4mc="; + hash = "sha256-GQ+7dyQ1LyYK8RYImsqVMEQvIC5pRQUVYYgO4FOShaE="; }; buildAndTestSubdir = "python"; From 8f29f75d07476dbd36cd38f922553240e0c14f50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Oct 2025 06:46:46 +0000 Subject: [PATCH 19/81] python3Packages.langsmith: 0.4.34 -> 0.4.37 --- pkgs/development/python-modules/langsmith/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 459550e65619..5ff75390c857 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "langsmith"; - version = "0.4.34"; + version = "0.4.37"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${version}"; - hash = "sha256-vuet4/Y5MW2Ob4zISl9vf3PD/OlmA/4/v7awVuvhk8E="; + hash = "sha256-NIEzzcWKNHNx0AJyEoC+laWFXhf1Ejp9zQvYMiYqCXI="; }; sourceRoot = "${src.name}/python"; From 621581ee425442659a3d5c049ea2e58352d217e6 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 16 Oct 2025 01:16:23 -0700 Subject: [PATCH 20/81] yubihsm-shell: fix compile Apply github.com/Yubico/yubihsm-shell/pull/493. --- pkgs/by-name/yu/yubihsm-shell/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index 4f9354ea4316..b57b9f9d728b 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, openssl, libusb1, @@ -25,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-ymGS35kjhNlFee3FEXF8n6Jm7NVaynjv+lpix6F75BQ="; }; + patches = [ + (fetchpatch { + url = "https://github.com/Yubico/yubihsm-shell/pull/493.patch"; + hash = "sha256-mM4ef1GV7BJT+EZ8B7+ejleTocglhxCWO/RKHZN69GE="; + }) + ]; + postPatch = '' # Can't find libyubihsm at runtime because of dlopen() in C code substituteInPlace lib/yubihsm.c \ From 983d3bd889ad8c829882a1b297cf021b33d0c3e6 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 16 Oct 2025 01:17:02 -0700 Subject: [PATCH 21/81] yubihsm-shell: add numinit as maintainer --- pkgs/by-name/yu/yubihsm-shell/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index b57b9f9d728b..3261fc7c0d7b 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -73,7 +73,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Thin wrapper around libyubihsm providing both an interactive and command-line interface to a YubiHSM"; homepage = "https://github.com/Yubico/yubihsm-shell"; - maintainers = with maintainers; [ matthewcroughan ]; + maintainers = with maintainers; [ + matthewcroughan + numinit + ]; license = licenses.asl20; platforms = platforms.all; }; From 0df985d86d9456fd6f63843b97791a44a4daf51c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 16 Oct 2025 13:07:17 -0700 Subject: [PATCH 22/81] python3Packages.holistic-trace-analysis: disable test on Darwin that assumes filesystem layout --- .../python-modules/holistic-trace-analysis/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix index 1e977ccf99c7..158f787a57bb 100644 --- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix +++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix @@ -1,8 +1,9 @@ { + lib, + stdenv, buildPythonPackage, fetchFromGitHub, jupyterlab, - lib, numpy, pandas, plotly, @@ -37,6 +38,11 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # Makes assumptions about the filesystem layout + "tests/test_config.py" + ]; + pythonImportsCheck = [ "hta" ]; meta = { From d2cb5dcb64862c4d8e01871e03ff78f58b3fe8e8 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 16 Oct 2025 13:25:26 -0700 Subject: [PATCH 23/81] python3Packages.holistic-trace-analysis: organize inputs --- .../python-modules/holistic-trace-analysis/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix index 158f787a57bb..fa72f161ad6c 100644 --- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix +++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix @@ -3,14 +3,20 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # build system + setuptools, + + # dependencies jupyterlab, numpy, pandas, plotly, pydot, - pytestCheckHook, - setuptools, torch, + + # tests + pytestCheckHook, }: buildPythonPackage rec { From b925c9e917fe5a4543db7ce6cc405c5645284818 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 16 Oct 2025 13:22:03 -0700 Subject: [PATCH 24/81] python3Packages.holistic-trace-analysis: fix tests that fail on Darwin due to different tmp layout --- .../holistic-trace-analysis/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix index fa72f161ad6c..04f13a487af6 100644 --- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix +++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix @@ -17,6 +17,7 @@ # tests pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -42,7 +43,15 @@ buildPythonPackage rec { torch ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # Permission denied: '/tmp/my_saved_cp_graph/trace_data.csv' + "test_critical_path_breakdown_and_save_restore" + ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Makes assumptions about the filesystem layout From d889ccb73fec797643c69ba613a148102b4548ea Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Thu, 16 Oct 2025 13:44:16 -0700 Subject: [PATCH 25/81] python3Packages.holistic-trace-analysis: disable test that fails on Darwin with Python 3.12 --- .../python-modules/holistic-trace-analysis/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix index 04f13a487af6..147bccbb1bc3 100644 --- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix +++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix @@ -51,11 +51,17 @@ buildPythonPackage rec { disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Permission denied: '/tmp/my_saved_cp_graph/trace_data.csv' "test_critical_path_breakdown_and_save_restore" + # Fails under Python 3.12 on Darwin with I/O errors + # Permission denied: '/tmp/path_does_not_exist/...' + "test_critical_path_overlaid_trace" ]; disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ # Makes assumptions about the filesystem layout "tests/test_config.py" + # EOFError -- makes assumptions about file I/O under Python 3.12 + # https://github.com/facebookresearch/HolisticTraceAnalysis/issues/300 + "tests/test_symbol_table.py" ]; pythonImportsCheck = [ "hta" ]; From 1f60b27cd1a8a67d1c62789927a9a4eb91357013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 16 Oct 2025 23:24:26 +0200 Subject: [PATCH 26/81] userborn: do not use mkForce to disable activationScripts --- nixos/modules/config/users-groups.nix | 8 ++++---- nixos/modules/services/system/userborn.nix | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 59f1b44483df..e2f9e7b5a8f0 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -96,8 +96,8 @@ let only one of {option}`hashedPassword`, {option}`password`, or {option}`hashedPasswordFile` will be set. - In a system where [](#opt-systemd.sysusers.enable) is `true`, typically - only one of {option}`initialPassword`, {option}`initialHashedPassword`, + In a system where [](#opt-systemd.sysusers.enable) or [](#opt-services.userborn.enable) is `true`, + typically only one of {option}`initialPassword`, {option}`initialHashedPassword`, or {option}`hashedPasswordFile` will be set. If the option {option}`users.mutableUsers` is true, the password defined @@ -874,7 +874,7 @@ in }; system.activationScripts.users = - if !config.systemd.sysusers.enable then + if !config.systemd.sysusers.enable && !config.services.userborn.enable then { supportsDryActivation = true; text = '' @@ -925,7 +925,7 @@ in # This does not work when the users and groups are created by # systemd-sysusers because the users are created too late then. system.activationScripts.hashes = - if !config.systemd.sysusers.enable then + if !config.systemd.sysusers.enable && !config.services.userborn.enable then { deps = [ "users" ]; text = '' diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index 96c0e6f65ae7..73b7581bd2b7 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -88,9 +88,6 @@ in } ]; - system.activationScripts.users = lib.mkForce ""; - system.activationScripts.hashes = lib.mkForce ""; - systemd = { # Create home directories, do not create /var/empty even if that's a user's From 777bff68be6cb3c0f8878b6e172cd5f8da61d9ca Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Wed, 15 Oct 2025 17:06:14 -0400 Subject: [PATCH 27/81] python3Packages.{astropy-extension-helpers,extension-helpers}: combine at 1.4.0 astropy-extension-helpers was at 1.1.0. extension-helpers was at 1.4.0. They are both the same package; they were just packaged twice. --- .../astropy-extension-helpers/default.nix | 68 ------------------- .../astropy-healpix/default.nix | 4 +- .../extension-helpers/default.nix | 12 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 pkgs/development/python-modules/astropy-extension-helpers/default.nix diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix deleted file mode 100644 index 6cebb395c8c2..000000000000 --- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - fetchpatch, - findutils, - pytestCheckHook, - pythonOlder, - pip, - setuptools, - setuptools-scm, - tomli, - wheel, -}: - -buildPythonPackage rec { - pname = "extension-helpers"; - version = "1.1.0"; - pyproject = true; - - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik="; - }; - - patches = [ - # Not needed to allow this package to build, but meant for it's dependent - # packages, like astropy. See explanation at: - # https://github.com/astropy/extension-helpers/pull/59 - (fetchpatch { - url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch"; - hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860="; - }) - ]; - - nativeBuildInputs = [ - setuptools - setuptools-scm - wheel - ]; - - propagatedBuildInputs = [ tomli ]; - - nativeCheckInputs = [ - findutils - pip - pytestCheckHook - ]; - - # avoid import mismatch errors, as conftest.py is copied to build dir - enabledTestPaths = [ "extension_helpers" ]; - - disabledTests = [ - # https://github.com/astropy/extension-helpers/issues/43 - "test_write_if_different" - ]; - - pythonImportsCheck = [ "extension_helpers" ]; - - meta = with lib; { - description = "Utilities for building and installing packages in the Astropy ecosystem"; - homepage = "https://github.com/astropy/extension-helpers"; - license = licenses.bsd3; - maintainers = with maintainers; [ rmcgibbo ]; - }; -} diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 236050ea25c3..d6fed0f21447 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -5,7 +5,7 @@ fetchPypi, numpy, astropy, - astropy-extension-helpers, + extension-helpers, setuptools, setuptools-scm, pytestCheckHook, @@ -25,7 +25,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - astropy-extension-helpers + extension-helpers numpy setuptools setuptools-scm diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix index 6908f66127ef..ba036029682a 100644 --- a/pkgs/development/python-modules/extension-helpers/default.nix +++ b/pkgs/development/python-modules/extension-helpers/default.nix @@ -4,6 +4,8 @@ fetchFromGitHub, build, cython, + findutils, + pip, pytestCheckHook, pythonOlder, setuptools-scm, @@ -17,8 +19,6 @@ buildPythonPackage rec { version = "1.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "astropy"; repo = "extension-helpers"; @@ -36,6 +36,8 @@ buildPythonPackage rec { nativeCheckInputs = [ build cython + findutils + pip pytestCheckHook wheel ]; @@ -45,10 +47,8 @@ buildPythonPackage rec { enabledTestPaths = [ "extension_helpers/tests" ]; disabledTests = [ - # Test require network access - "test_only_pyproject" - # ModuleNotFoundError - "test_no_setup_py" + # https://github.com/astropy/extension-helpers/issues/43 + "test_write_if_different" ]; meta = with lib; { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0521f9bc947b..a1b9434ef09d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -87,6 +87,7 @@ mapAliases { argon2_cffi = argon2-cffi; # added 2022-05-09 arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04 APScheduler = apscheduler; # added 2023-02-19 + astropy-extension-helpers = extension-helpers; # Added 2025-10-15 async_generator = async-generator; # added 2023-08-08 async_stagger = async-stagger; # added 2023-08-08 asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5f5db002b880..f851762b2e0e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1001,8 +1001,6 @@ self: super: with self; { astropy = callPackage ../development/python-modules/astropy { }; - astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { }; - astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; From c3fb98e870878abbab4caf9a0d517f894efa0c7e Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 17 Oct 2025 02:11:34 +0200 Subject: [PATCH 28/81] forgejo{,-lts}: use `writableTmpDirAsHomeHook` --- pkgs/by-name/fo/forgejo/generic.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 9893f9cb8bde..f2c0c7f8ddbd 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -26,6 +26,7 @@ stdenv, fetchFromGitea, buildNpmPackage, + writableTmpDirAsHomeHook, }: let @@ -77,6 +78,7 @@ buildGoModule rec { nativeCheckInputs = [ git openssh + writableTmpDirAsHomeHook ]; patches = [ @@ -104,9 +106,6 @@ buildGoModule rec { ''; preCheck = '' - # $HOME is required for ~/.ssh/authorized_keys and such - export HOME="$TMPDIR/home" - # expose and use the GO_TEST_PACKAGES var from the Makefile # instead of manually copying over the entire list: # https://codeberg.org/forgejo/forgejo/src/tag/v7.0.4/Makefile#L124 From 1020145d49afaccb4fc2ab99d3486503e1c97883 Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Thu, 13 Mar 2025 10:46:18 +1000 Subject: [PATCH 29/81] nixos/bind: run named-checkconf on config file --- nixos/modules/services/networking/bind.nix | 155 ++++++++++++--------- 1 file changed, 93 insertions(+), 62 deletions(-) diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index bc8934eb8fa1..899ee1914078 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -21,6 +21,14 @@ let }) ); + bindRndcMacType = "hmac-sha256"; + + bindRndcKeyFile = "/etc/bind/rndc.key"; + + bindNamedExe = lib.getExe' bindPkg "named"; + + bindRndcExe = lib.getExe' bindPkg "rndc"; + bindZoneOptions = { name, config, ... }: { @@ -63,68 +71,90 @@ let }; }; - confFile = pkgs.writeText "named.conf" '' - include "/etc/bind/rndc.key"; - controls { - inet 127.0.0.1 allow {localhost;} keys {"rndc-key";}; + testRndcKey = pkgs.writeTextFile { + name = "testrndc.key"; + text = '' + key "rndc-key" { + algorithm ${bindRndcMacType}; + secret "0123456789abcdefghijklmnopqrstuvw="; + }; + ''; + }; + + confFile = pkgs.writeTextFile { + name = "named.conf"; + checkPhase = '' + runHook preCheck + echo "Checking named configuration file..."; + ${lib.getExe' bindPkg "named-checkconf"} -z $target -t ${cfg.directory} + runHook postCheck + ''; + derivationArgs = { + doCheck = true; + postCheck = '' + substituteInPlace $target --replace-fail ${testRndcKey} ${bindRndcKeyFile} + ''; }; - acl cachenetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} }; - acl badnetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} }; + # The include path in the first line will be replaced in the postCheck hook. + text = '' + include "${testRndcKey}"; + controls { + inet 127.0.0.1 allow {localhost;} keys {"rndc-key";}; + }; - options { - listen-on port ${toString cfg.listenOnPort} { ${ - lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn - } }; - listen-on-v6 port ${toString cfg.listenOnIpv6Port} { ${ - lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6 - } }; - allow-query-cache { cachenetworks; }; - blackhole { badnetworks; }; - forward ${cfg.forward}; - forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; - directory "${cfg.directory}"; - pid-file "/run/named/named.pid"; - ${cfg.extraOptions} - }; + acl cachenetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} }; + acl badnetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} }; - ${cfg.extraConfig} + options { + listen-on { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn} }; + listen-on-v6 { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} }; + allow-query-cache { cachenetworks; }; + blackhole { badnetworks; }; + forward ${cfg.forward}; + forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} }; + directory "${cfg.directory}"; + pid-file "/run/named/named.pid"; + ${cfg.extraOptions} + }; - ${lib.concatMapStrings ( - { - name, - file, - master ? true, - slaves ? [ ], - masters ? [ ], - allowQuery ? [ ], - extraConfig ? "", - }: - '' - zone "${name}" { - type ${if master then "master" else "slave"}; - file "${file}"; - ${ - if master then - '' - allow-transfer { - ${lib.concatMapStrings (ip: "${ip};\n") slaves} - }; - '' - else - '' - masters { - ${lib.concatMapStrings (ip: "${ip};\n") masters} - }; - '' - } - allow-query { ${lib.concatMapStrings (ip: "${ip}; ") allowQuery}}; - ${extraConfig} - }; - '' - ) (lib.attrValues cfg.zones)} - ''; + ${cfg.extraConfig} + ${lib.concatMapStrings ( + { + name, + file, + master ? true, + slaves ? [ ], + masters ? [ ], + allowQuery ? [ ], + extraConfig ? "", + }: + '' + zone "${name}" { + type ${if master then "master" else "slave"}; + file "${file}"; + ${ + if master then + '' + allow-transfer { + ${lib.concatMapStrings (ip: "${ip};\n") slaves} + }; + '' + else + '' + masters { + ${lib.concatMapStrings (ip: "${ip};\n") masters} + }; + '' + } + allow-query { ${lib.concatMapStrings (ip: "${ip}; ") allowQuery}}; + ${extraConfig} + }; + '' + ) (lib.attrValues cfg.zones)} + ''; + }; in { @@ -284,7 +314,8 @@ in defaultText = lib.literalExpression "confFile"; description = '' Overridable config file to use for named. By default, that - generated by nixos. + generated by nixos. If overriden, it will not be checked by + named-checkconf. ''; }; @@ -320,16 +351,16 @@ in wantedBy = [ "multi-user.target" ]; preStart = '' - if ! [ -f "/etc/bind/rndc.key" ]; then - ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -a -A hmac-sha256 2>/dev/null + if ! [ -f ${bindRndcKeyFile} ]; then + ${lib.getExe' bindPkg "rndc-confgen"} -c ${bindRndcKeyFile} -a -A ${bindRndcMacType} 2>/dev/null fi ''; serviceConfig = { Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788 - ExecStart = "${bindPkg.out}/sbin/named ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraArgs}"; - ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload"; - ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop"; + ExecStart = "${bindNamedExe} ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraArgs}"; + ExecReload = "${bindRndcExe} -k '${bindRndcKeyFile}' reload"; + ExecStop = "${bindRndcExe} -k '${bindRndcKeyFile}' stop"; User = bindUser; RuntimeDirectory = "named"; RuntimeDirectoryPreserve = "yes"; From 7bf963ef1f01bc50e740e9b0d915ebfe78a49716 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 15 Oct 2025 13:53:43 +0200 Subject: [PATCH 30/81] {gpclient,gpauth}: add darwin support --- pkgs/by-name/gp/gpauth/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index ccefe5e53e4c..a78cddb2f7fe 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -6,6 +6,7 @@ pkg-config, perl, webkitgtk_4_1, + stdenv, }: rustPlatform.buildRustPackage rec { @@ -29,10 +30,12 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ webkitgtk_4_1 ]; - meta = with lib; { + meta = { changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md"; description = "CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method"; longDescription = '' @@ -43,14 +46,11 @@ rustPlatform.buildRustPackage rec { the same features as the GUI version. ''; homepage = "https://github.com/${src.owner}/${src.repo}"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ binary-eater m1dugh ]; - platforms = [ - "aarch64-linux" - "x86_64-linux" - ]; + platforms = with lib.platforms; linux ++ darwin; }; } From e2fdee19aa388a2fd638b987c01aa985f6fbcd19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 07:50:03 +0000 Subject: [PATCH 31/81] posting: 2.9.1 -> 2.9.2 --- pkgs/by-name/po/posting/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix index 707e4c5bca3d..cf897cd5022a 100644 --- a/pkgs/by-name/po/posting/package.nix +++ b/pkgs/by-name/po/posting/package.nix @@ -6,14 +6,14 @@ }: python3Packages.buildPythonApplication rec { pname = "posting"; - version = "2.9.1"; + version = "2.9.2"; pyproject = true; src = fetchFromGitHub { owner = "darrenburns"; repo = "posting"; tag = version; - hash = "sha256-YaN7kuGRZ6UJTuf2vYDnIinyzMzsKDQEA4B5SmmggA4="; + hash = "sha256-BX1D9XgBqRIfavDxAQH7mPP/dnayQu3xSSAF6/JSM54="; }; pythonRelaxDeps = true; From 85753a26c56db7025b66db2a8058b305a15e7943 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:56:58 +0000 Subject: [PATCH 32/81] python3Packages.columnize: init at 0.3.11 --- .../python-modules/columnize/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/columnize/default.nix diff --git a/pkgs/development/python-modules/columnize/default.nix b/pkgs/development/python-modules/columnize/default.nix new file mode 100644 index 000000000000..e33ac648ad68 --- /dev/null +++ b/pkgs/development/python-modules/columnize/default.nix @@ -0,0 +1,38 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "columnize"; + version = "0.3.11"; + pyproject = true; + + src = fetchFromGitHub { + owner = "rocky"; + repo = "pycolumnize"; + tag = "3.11"; + hash = "sha256-YJEIujoRpLvUM4H4CB1nEJaYStFOSVKIGzchnptlt7M="; + }; + + build-system = [ + setuptools + ]; + + pythonImportsCheck = [ "columnize" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Python module to align a simple (not nested) list in columns"; + homepage = "https://github.com/rocky/pycolumnize"; + changelog = "https://github.com/rocky/pycolumnize/blob/${src.tag}/ChangeLog"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5655cb7d68b2..f27d6f7ad433 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2883,6 +2883,8 @@ self: super: with self; { colout = callPackage ../development/python-modules/colout { }; + columnize = callPackage ../development/python-modules/columnize { }; + comet-ml = callPackage ../development/python-modules/comet-ml { }; cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; From 66375ddb4f9638de1b3b2ef272306cd3ef1616ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:59:45 +0000 Subject: [PATCH 33/81] python3Packages.hatch-sphinx: init at 0.0.4 --- .../python-modules/hatch-sphinx/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/hatch-sphinx/default.nix diff --git a/pkgs/development/python-modules/hatch-sphinx/default.nix b/pkgs/development/python-modules/hatch-sphinx/default.nix new file mode 100644 index 000000000000..a9454511dd6a --- /dev/null +++ b/pkgs/development/python-modules/hatch-sphinx/default.nix @@ -0,0 +1,60 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatch-vcs, + hatchling, + + # dependencies + sphinx, + + # tests + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "hatch-sphinx"; + version = "0.0.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "llimeht"; + repo = "hatch-sphinx"; + tag = "v${version}"; + hash = "sha256-8g0UkDMf05CVd2VbnV30pZpQ9chJhCkKfci7zmcIOoQ="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + hatchling + sphinx + ]; + + pythonImportsCheck = [ "hatch_sphinx" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # /nix/store/62fdlzq1x1ak2lsxp4ij7ip5k9nia3hc-python3-3.13.7/bin/python3.13: No module named build + "test_tool_apidoc" + "test_tool_build" + "test_tool_custom_lists_globs" + "test_tool_custom_lists_noglobs" + "test_tool_custom_strings" + ]; + + meta = { + description = "Hatchling build plugin for Sphinx documentation"; + homepage = "https://github.com/llimeht/hatch-sphinx"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f27d6f7ad433..7631674674ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6558,6 +6558,8 @@ self: super: with self; { hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { }; + hatch-sphinx = callPackage ../development/python-modules/hatch-sphinx { }; + hatch-vcs = callPackage ../development/python-modules/hatch-vcs { }; hatchling = callPackage ../development/python-modules/hatchling { }; From fea6ed879b2ddf0e0a045dccccb59ee7e343de63 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 17 Oct 2025 08:46:12 +0000 Subject: [PATCH 34/81] python3Packages.sasmodels: 1.0.10 -> 1.0.11 Diff: https://github.com/SasView/sasmodels/compare/v1.0.10...v1.0.11 --- .../python-modules/sasmodels/default.nix | 62 ++++++++++++++----- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 73a4b92b4092..c9c0478a405d 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -2,8 +2,16 @@ lib, fetchFromGitHub, buildPythonPackage, - setuptools, - pytestCheckHook, + + # build-system + columnize, + hatch-requirements-txt, + hatch-sphinx, + hatch-vcs, + hatchling, + siphash24, + sphinx, + numpy, scipy, bumps, @@ -12,27 +20,46 @@ opencl-headers, pycuda, pyopencl, - pythonOlder, + + # optional-dependencies + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "sasmodels"; - version = "1.0.10"; + version = "1.0.11"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "SasView"; repo = "sasmodels"; tag = "v${version}"; - hash = "sha256-cTXFlTCm521+xhcggFvDqVZrTJuDiVZ8PazBwA3mKJU="; + hash = "sha256-AtFkcW7h2hMnQAeAk0fGsARXwpuaSb7ERBhdnAH4pCY="; }; - build-system = [ setuptools ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '"tccbox",' "" + ''; + + build-system = [ + columnize + hatch-requirements-txt + hatch-sphinx + hatch-vcs + hatchling + siphash24 + sphinx + ]; buildInputs = [ opencl-headers ]; + pythonRemoveDeps = [ + "tccbox" # unpackaged + ]; dependencies = [ numpy scipy @@ -43,25 +70,26 @@ buildPythonPackage rec { docutils bumps matplotlib - # columnize + columnize ]; server = [ bumps ]; opencl = [ pyopencl ]; cuda = [ pycuda ]; }; - nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full; - - preCheck = '' - export HOME=$TMPDIR - ''; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ] + ++ optional-dependencies.full; pythonImportsCheck = [ "sasmodels" ]; - meta = with lib; { + meta = { description = "Library of small angle scattering models"; homepage = "https://github.com/SasView/sasmodels"; - license = licenses.bsd3; - maintainers = with maintainers; [ rprospero ]; + changelog = "https://github.com/SasView/sasmodels/blob/${src.tag}/CHANGES.rst"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ rprospero ]; }; } From d3f85775b4fba37624530cb39a9647e79209b409 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 11:36:54 +0000 Subject: [PATCH 35/81] python3Packages.check-manifest: 0.50 -> 0.51 --- pkgs/development/python-modules/check-manifest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 53b4f7476401..d8e50380e313 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "check-manifest"; - version = "0.50"; + version = "0.51"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mgedmin"; repo = "check-manifest"; tag = version; - hash = "sha256-wZ0mx2b3QkwTOPMLQ03SFVwnbsVO5RezOSX50ZOYvw8="; + hash = "sha256-tT6xQZwqJIsyrO9BjWweIeNgYaopziewerVBk0mFVYg="; }; build-system = [ setuptools ]; From e2f67eb246cb160dacbf358153dc5ab6d7b124ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 12:46:38 +0000 Subject: [PATCH 36/81] bulletty: 0.1.8 -> 0.1.9 --- pkgs/by-name/bu/bulletty/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix index 653592f22499..9251f04ed060 100644 --- a/pkgs/by-name/bu/bulletty/package.nix +++ b/pkgs/by-name/bu/bulletty/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bulletty"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "CrociDB"; repo = "bulletty"; tag = "v${finalAttrs.version}"; - hash = "sha256-MVXz3ozAL26EYWAsarFbRR0cmAtaRpxcQROsLye56yE="; + hash = "sha256-fNMUdZ5WoDUVShiKl4pitkcOlHYTKXUVfiAHVqpdWmo="; }; - cargoHash = "sha256-Q9h9VUTeFvP6pkQKj7y2pKVpoeg1hyoAbXMhAaO5zh8="; + cargoHash = "sha256-ZdJtFPEjPDQSUEtdPv3uIH44wa6mGPzm/KRp5VTOb1Y="; # perl is required for bulletty package build for openssl nativeBuildInputs = with pkgs; [ From aa914730ac66c59b794200ddf9e6dc4a20395c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 17 Oct 2025 08:19:19 -0700 Subject: [PATCH 37/81] libdeltachat: 2.20.0 -> 2.22.0 Diff: https://github.com/chatmail/core/compare/v2.20.0...v2.22.0 Changelog: https://github.com/chatmail/core/blob/v2.22.0/CHANGELOG.md --- pkgs/by-name/li/libdeltachat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 9b5035bba17d..b9ccd2ce6043 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "2.20.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw="; + hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc="; + hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ="; }; nativeBuildInputs = [ From a1c24d0868d5300041e8056389ba900dac87b952 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 17:49:01 +0200 Subject: [PATCH 38/81] filesender: remove This depends on `simplesamlphp` which is one major version behind, was packaged in an outdated version from the beginning and is known vulnerable in nixpkgs. As a result, I decided to remove simplesamlphp and all its reverse dependencies. --- nixos/doc/manual/redirects.json | 6 - .../manual/release-notes/rl-2405.section.md | 2 +- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 + nixos/modules/services/web-apps/filesender.md | 55 ---- .../modules/services/web-apps/filesender.nix | 254 ------------------ nixos/tests/all-tests.nix | 1 - nixos/tests/filesender.nix | 146 ---------- pkgs/by-name/fi/filesender/package.nix | 43 --- .../filesender/separate_mutable_paths.patch | 122 --------- pkgs/top-level/aliases.nix | 1 + 12 files changed, 7 insertions(+), 629 deletions(-) delete mode 100644 nixos/modules/services/web-apps/filesender.md delete mode 100644 nixos/modules/services/web-apps/filesender.nix delete mode 100644 nixos/tests/filesender.nix delete mode 100644 pkgs/by-name/fi/filesender/package.nix delete mode 100644 pkgs/by-name/fi/filesender/separate_mutable_paths.patch diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 3ddfa1b1c385..e7a60706ecfe 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -824,12 +824,6 @@ "module-services-glance-quickstart": [ "index.html#module-services-glance-quickstart" ], - "module-services-filesender": [ - "index.html#module-services-filesender" - ], - "module-services-filesender-quickstart": [ - "index.html#module-services-filesender-quickstart" - ], "module-services-discourse": [ "index.html#module-services-discourse" ], diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 1cbf71a7aad8..7b4080ea3f39 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -92,7 +92,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [FCast Receiver](https://fcast.org), an open-source alternative to Chromecast and AirPlay. Available as [programs.fcast-receiver](#opt-programs.fcast-receiver.enable). -- [FileSender](https://filesender.org/), a file sharing software. Available as [services.filesender](#opt-services.filesender.enable). +- [FileSender](https://filesender.org/), a file sharing software. Available as `services.filesender`. - [Firefly-iii](https://www.firefly-iii.org), a free and open source personal finance manager. Available as [services.firefly-iii](#opt-services.firefly-iii.enable). diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index e0dd13567a43..72a784afab78 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -346,6 +346,8 @@ - `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module is unmaintained and users are strongly recommended to switch to kernels that support the out-of-tree module. +- `services.filesender` and the package `filesender` have been removed because they depend on `simplesamlphp`. + - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server. - `networking.wireless.networks.` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ccbfd4d5c0d7..f00d30e89ccb 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1587,7 +1587,6 @@ ./services/web-apps/fediwall.nix ./services/web-apps/fider.nix ./services/web-apps/filebrowser.nix - ./services/web-apps/filesender.nix ./services/web-apps/firefly-iii-data-importer.nix ./services/web-apps/firefly-iii.nix ./services/web-apps/flarum.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a4ed680bd552..4c156727e6df 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -401,6 +401,9 @@ in services.invoiceplane has been removed since the service only supported PHP 8.1 which is EOL and removed from nixpkgs. '') + (mkRemovedOptionModule [ "services" "filesender" ] '' + services.filesender has been removed since it depends on simplesamlphp which was severely unmaintained. + '') (mkRemovedOptionModule [ "services" "postfixadmin" ] '' services.postfixadmin has been removed since it was unmaintained in nixpkgs and the version available only supported PHP 8.1 which is EOL. diff --git a/nixos/modules/services/web-apps/filesender.md b/nixos/modules/services/web-apps/filesender.md deleted file mode 100644 index 0f768857e905..000000000000 --- a/nixos/modules/services/web-apps/filesender.md +++ /dev/null @@ -1,55 +0,0 @@ -# FileSender {#module-services-filesender} - -[FileSender](https://filesender.org/software/) is a software that makes it easy to send and receive big files. - -## Quickstart {#module-services-filesender-quickstart} - -FileSender uses [SimpleSAMLphp](https://simplesamlphp.org/) for authentication, which needs to be configured separately. - -Minimal working instance of FileSender that uses password-authentication would look like this: - -```nix -let - format = pkgs.formats.php { }; -in -{ - networking.firewall.allowedTCPPorts = [ - 80 - 443 - ]; - services.filesender = { - enable = true; - localDomain = "filesender.example.com"; - configureNginx = true; - database.createLocally = true; - - settings = { - auth_sp_saml_authentication_source = "default"; - auth_sp_saml_uid_attribute = "uid"; - storage_filesystem_path = ""; - admin = "admin"; - admin_email = "admin@example.com"; - email_reply_to = "noreply@example.com"; - }; - }; - services.simplesamlphp.filesender = { - settings = { - "module.enable".exampleauth = true; - }; - authSources = { - admin = [ "core:AdminPassword" ]; - default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] { - "admin:admin123" = { - uid = [ "admin" ]; - cn = [ "admin" ]; - mail = [ "admin@example.com" ]; - }; - }; - }; - }; -} -``` - -::: {.warning} -Example above uses hardcoded clear-text password, in production you should use other authentication method like LDAP. You can check supported authentication methods [in SimpleSAMLphp documentation](https://simplesamlphp.org/docs/stable/simplesamlphp-idp.html). -::: diff --git a/nixos/modules/services/web-apps/filesender.nix b/nixos/modules/services/web-apps/filesender.nix deleted file mode 100644 index f2339e6e32b1..000000000000 --- a/nixos/modules/services/web-apps/filesender.nix +++ /dev/null @@ -1,254 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - format = pkgs.formats.php { finalVariable = "config"; }; - - cfg = config.services.filesender; - simpleSamlCfg = config.services.simplesamlphp.filesender; - fpm = config.services.phpfpm.pools.filesender; - - filesenderConfigDirectory = pkgs.runCommand "filesender-config" { } '' - mkdir $out - cp ${format.generate "config.php" cfg.settings} $out/config.php - ''; -in -{ - meta = { - maintainers = with lib.maintainers; [ nhnn ]; - doc = ./filesender.md; - }; - - options.services.filesender = with lib; { - enable = mkEnableOption "FileSender"; - package = mkPackageOption pkgs "filesender" { }; - user = mkOption { - description = "User under which filesender runs."; - type = types.str; - default = "filesender"; - }; - database = { - createLocally = mkOption { - type = types.bool; - default = true; - description = '' - Create the PostgreSQL database and database user locally. - ''; - }; - hostname = mkOption { - type = types.str; - default = "/run/postgresql"; - description = "Database hostname."; - }; - port = mkOption { - type = types.port; - default = 5432; - description = "Database port."; - }; - name = mkOption { - type = types.str; - default = "filesender"; - description = "Database name."; - }; - user = mkOption { - type = types.str; - default = "filesender"; - description = "Database user."; - }; - passwordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/filesender-dbpassword"; - description = '' - A file containing the password corresponding to - [](#opt-services.filesender.database.user). - ''; - }; - }; - settings = mkOption { - type = types.submodule { - freeformType = format.type; - options = { - site_url = mkOption { - type = types.str; - description = "Site URL. Used in emails, to build URLs for logging in, logging out, build URL for upload endpoint for web workers, to include scripts etc."; - }; - admin = mkOption { - type = types.commas; - description = '' - UIDs (as per the configured saml_uid_attribute) of FileSender administrators. - Accounts with these UIDs can access the Admin page through the web UI. - ''; - }; - admin_email = mkOption { - type = types.commas; - description = '' - Email address of FileSender administrator(s). - Emails regarding disk full etc. are sent here. - You should use a role-address here. - ''; - }; - storage_filesystem_path = mkOption { - type = types.nullOr types.str; - description = "When using storage type filesystem this is the absolute path to the file system where uploaded files are stored until they expire. Your FileSender storage root."; - }; - log_facilities = mkOption { - type = format.type; - default = [ { type = "error_log"; } ]; - description = "Defines where FileSender logging is sent. You can sent logging to a file, to syslog or to the default PHP log facility (as configured through your webserver's PHP module). The directive takes an array of one or more logging targets. Logging can be sent to multiple targets simultaneously. Each logging target is a list containing the name of the logging target and a number of attributes which vary per log target. See below for the exact definiation of each log target."; - }; - }; - }; - default = { }; - description = '' - Configuration options used by FileSender. - See [](https://docs.filesender.org/filesender/v2.0/admin/configuration/) - for available options. - ''; - }; - configureNginx = mkOption { - type = types.bool; - default = true; - description = "Configure nginx as a reverse proxy for FileSender."; - }; - localDomain = mkOption { - type = types.str; - example = "filesender.example.org"; - description = "The domain serving your FileSender instance."; - }; - poolSettings = mkOption { - type = - with types; - attrsOf (oneOf [ - str - int - bool - ]); - default = { - "pm" = "dynamic"; - "pm.max_children" = "32"; - "pm.start_servers" = "2"; - "pm.min_spare_servers" = "2"; - "pm.max_spare_servers" = "4"; - "pm.max_requests" = "500"; - }; - description = '' - Options for FileSender's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. - ''; - }; - }; - config = lib.mkIf cfg.enable { - services.simplesamlphp.filesender = { - phpfpmPool = "filesender"; - localDomain = cfg.localDomain; - settings.baseurlpath = lib.mkDefault "https://${cfg.localDomain}/saml"; - }; - - services.phpfpm = { - pools.filesender = { - user = cfg.user; - group = config.services.nginx.group; - phpEnv = { - FILESENDER_CONFIG_DIR = toString filesenderConfigDirectory; - SIMPLESAMLPHP_CONFIG_DIR = toString simpleSamlCfg.configDir; - }; - settings = { - "listen.owner" = config.services.nginx.user; - "listen.group" = config.services.nginx.group; - } - // cfg.poolSettings; - }; - }; - - services.nginx = lib.mkIf cfg.configureNginx { - enable = true; - virtualHosts.${cfg.localDomain} = { - root = "${cfg.package}/www"; - extraConfig = '' - index index.php; - ''; - locations = { - "/".extraConfig = '' - try_files $uri $uri/ /index.php?args; - ''; - "~ [^/]\\.php(/|$)" = { - extraConfig = '' - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${fpm.socket}; - include ${pkgs.nginx}/conf/fastcgi.conf; - fastcgi_intercept_errors on; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - ''; - }; - "~ /\\.".extraConfig = "deny all;"; - }; - }; - }; - - services.postgresql = lib.mkIf cfg.database.createLocally { - enable = true; - ensureDatabases = [ cfg.database.name ]; - ensureUsers = [ - { - name = cfg.database.user; - ensureDBOwnership = true; - } - ]; - }; - - services.filesender.settings = lib.mkMerge [ - (lib.mkIf cfg.database.createLocally { - db_host = "/run/postgresql"; - db_port = "5432"; - db_password = "."; # FileSender requires it even when on UNIX socket auth. - }) - (lib.mkIf (!cfg.database.createLocally) { - db_host = cfg.database.hostname; - db_port = toString cfg.database.port; - db_password = format.lib.mkRaw "file_get_contents('${cfg.database.passwordFile}')"; - }) - { - site_url = lib.mkDefault "https://${cfg.localDomain}"; - db_type = "pgsql"; - db_username = cfg.database.user; - db_database = cfg.database.name; - "auth_sp_saml_simplesamlphp_url" = "/saml"; - "auth_sp_saml_simplesamlphp_location" = "${simpleSamlCfg.libDir}"; - } - ]; - - systemd.services.filesender-initdb = { - description = "Init filesender DB"; - - wantedBy = [ - "multi-user.target" - "phpfpm-filesender.service" - ]; - after = [ "postgresql.target" ]; - - restartIfChanged = true; - - serviceConfig = { - Environment = [ - "FILESENDER_CONFIG_DIR=${toString filesenderConfigDirectory}" - "SIMPLESAMLPHP_CONFIG_DIR=${toString simpleSamlCfg.configDir}" - ]; - Type = "oneshot"; - Group = config.services.nginx.group; - User = "filesender"; - ExecStart = "${fpm.phpPackage}/bin/php ${cfg.package}/scripts/upgrade/database.php"; - }; - }; - - users.extraUsers.filesender = lib.mkIf (cfg.user == "filesender") { - home = "/var/lib/filesender"; - group = config.services.nginx.group; - createHome = true; - isSystemUser = true; - }; - }; -} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 1f1f5ae5e043..66a599383a95 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -532,7 +532,6 @@ in ferretdb = import ./ferretdb.nix { inherit pkgs runTest; }; fider = runTest ./fider.nix; filebrowser = runTest ./filebrowser.nix; - filesender = runTest ./filesender.nix; filesystems-overlayfs = runTest ./filesystems-overlayfs.nix; firefly-iii = runTest ./firefly-iii.nix; firefly-iii-data-importer = runTest ./firefly-iii-data-importer.nix; diff --git a/nixos/tests/filesender.nix b/nixos/tests/filesender.nix deleted file mode 100644 index b81b2ab04af3..000000000000 --- a/nixos/tests/filesender.nix +++ /dev/null @@ -1,146 +0,0 @@ -{ pkgs, lib, ... }: -{ - name = "filesender"; - meta = { - maintainers = with lib.maintainers; [ nhnn ]; - broken = pkgs.stdenv.hostPlatform.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64 - }; - - nodes.filesender = - { ... }: - let - format = pkgs.formats.php { }; - in - { - networking.firewall.allowedTCPPorts = [ 80 ]; - - services.filesender.enable = true; - services.filesender.localDomain = "filesender"; - services.filesender.settings = { - auth_sp_saml_authentication_source = "default"; - auth_sp_saml_uid_attribute = "uid"; - storage_filesystem_path = "/tmp"; - site_url = "http://filesender"; - force_ssl = false; - admin = ""; - admin_email = "admin@localhost"; - email_reply_to = "noreply@localhost"; - }; - services.simplesamlphp.filesender = { - settings = { - baseurlpath = "http://filesender/saml"; - "module.enable".exampleauth = true; - }; - authSources = { - admin = [ "core:AdminPassword" ]; - default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] { - "user:password" = { - uid = [ "user" ]; - cn = [ "user" ]; - mail = [ "user@nixos.org" ]; - }; - }; - }; - }; - }; - - nodes.client = - { - pkgs, - nodes, - ... - }: - let - filesenderIP = (builtins.head (nodes.filesender.networking.interfaces.eth1.ipv4.addresses)).address; - in - { - networking.hosts.${filesenderIP} = [ "filesender" ]; - - environment.systemPackages = - let - username = "user"; - password = "password"; - browser-test = - pkgs.writers.writePython3Bin "browser-test" - { - libraries = [ pkgs.python3Packages.selenium ]; - flakeIgnore = [ - "E124" - "E501" - ]; - } - '' - from selenium.webdriver.common.by import By - from selenium.webdriver import Firefox - from selenium.webdriver.firefox.options import Options - from selenium.webdriver.firefox.firefox_profile import FirefoxProfile - from selenium.webdriver.firefox.service import Service - from selenium.webdriver.support.ui import WebDriverWait - from selenium.webdriver.support import expected_conditions as EC - from subprocess import STDOUT - import string - import random - import logging - import time - selenium_logger = logging.getLogger("selenium") - selenium_logger.setLevel(logging.DEBUG) - selenium_logger.addHandler(logging.StreamHandler()) - profile = FirefoxProfile() - profile.set_preference("browser.download.folderList", 2) - profile.set_preference("browser.download.manager.showWhenStarting", False) - profile.set_preference("browser.download.dir", "/tmp/firefox") - profile.set_preference("browser.helperApps.neverAsk.saveToDisk", "text/plain;text/txt") - options = Options() - options.profile = profile - options.add_argument('--headless') - service = Service(log_output=STDOUT) - driver = Firefox(options=options) - driver.set_window_size(1024, 768) - driver.implicitly_wait(30) - driver.get('http://filesender/') - wait = WebDriverWait(driver, 20) - wait.until(EC.title_contains("FileSender")) - driver.find_element(By.ID, "btn_logon").click() - wait.until(EC.title_contains("Enter your username and password")) - driver.find_element(By.ID, 'username').send_keys( - '${username}' - ) - driver.find_element(By.ID, 'password').send_keys( - '${password}' - ) - driver.find_element(By.ID, "submit_button").click() - wait.until(EC.title_contains("FileSender")) - wait.until(EC.presence_of_element_located((By.ID, "topmenu_logoff"))) - test_string = "".join(random.choices(string.ascii_uppercase + string.digits, k=20)) - with open("/tmp/test_file.txt", "w") as file: - file.write(test_string) - driver.find_element(By.ID, "files").send_keys("/tmp/test_file.txt") - time.sleep(2) - driver.find_element(By.CSS_SELECTOR, '.start').click() - wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download_link"))) - download_link = driver.find_element(By.CSS_SELECTOR, '.download_link > textarea').get_attribute('value').strip() - driver.get(download_link) - wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download"))) - driver.find_element(By.CSS_SELECTOR, '.download').click() - wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)"))) - driver.find_element(By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)").click() - driver.close() - driver.quit() - ''; - in - [ - pkgs.firefox-unwrapped - pkgs.geckodriver - browser-test - ]; - }; - - testScript = '' - start_all() - filesender.wait_for_file("/run/phpfpm/filesender.sock") - filesender.wait_for_open_port(80) - if "If you have received an invitation to access this site as a guest" not in client.wait_until_succeeds("curl -sS -f http://filesender"): - raise Exception("filesender returned invalid html") - client.succeed("browser-test") - ''; -} diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix deleted file mode 100644 index 5d8736839bcb..000000000000 --- a/pkgs/by-name/fi/filesender/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - stdenv, - fetchFromGitHub, - lib, - nixosTests, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "filesender"; - version = "2.57"; - - src = fetchFromGitHub { - owner = "filesender"; - repo = "filesender"; - tag = "filesender-${finalAttrs.version}"; - hash = "sha256-I/9Y64jWm7QdQ1yhjCHkLfkKrzV6y0Rp+wkZbDP86fw="; - }; - - patches = [ - # /nix/store is read-only, but filesender searches config and logs inside of installation directory. - # This patch changes search directories to FILESENDER_CONFIG_DIR and FILESENDER_LOG_DIR environment variables. - ./separate_mutable_paths.patch - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/ - cp -R . $out/ - - runHook postInstall - ''; - - passthru.tests = { - inherit (nixosTests) filesender; - }; - - meta = { - description = "Web application for sending large files to other users"; - homepage = "https://filesender.org/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ nhnn ]; - }; -}) diff --git a/pkgs/by-name/fi/filesender/separate_mutable_paths.patch b/pkgs/by-name/fi/filesender/separate_mutable_paths.patch deleted file mode 100644 index c320e5872168..000000000000 --- a/pkgs/by-name/fi/filesender/separate_mutable_paths.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff --git a/classes/utils/Config.class.php b/classes/utils/Config.class.php -index a4d819bc..318defdf 100644 ---- a/classes/utils/Config.class.php -+++ b/classes/utils/Config.class.php -@@ -30,7 +30,7 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - --if (!defined('FILESENDER_BASE')) { // Require environment (fatal) -+if (!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) { // Require environment (fatal) - die('Missing environment'); - } - -@@ -116,7 +116,7 @@ class Config - } - - // Check if main config exists -- $main_config_file = FILESENDER_BASE.'/config/config.php'; -+ $main_config_file = FILESENDER_CONFIG_DIR.'/config.php'; - if (!file_exists($main_config_file)) { - throw new ConfigFileMissingException($main_config_file); - } -@@ -136,7 +136,7 @@ class Config - - - // load password file if it is there -- $pass_config_file = FILESENDER_BASE.'/config/config-passwords.php'; -+ $pass_config_file = FILESENDER_CONFIG_DIR.'/config-passwords.php'; - if (file_exists($pass_config_file)) { - $config = array(); - include_once($pass_config_file); -@@ -153,7 +153,7 @@ class Config - throw new ConfigBadParameterException('virtualhost'); - } - -- $config_file = FILESENDER_BASE.'/config/'.$virtualhost.'/config.php'; -+ $config_file = FILESENDER_CONFIG_DIR.$virtualhost.'/config.php'; - if (!file_exists($config_file)) { - throw new ConfigFileMissingException($config_file); - } // Should exist even if empty -@@ -175,7 +175,7 @@ class Config - } - foreach ($regex_and_configs as $regex => $extra_config_name) { - if (preg_match('`'.$regex.'`', $auth_attrs[$attr])) { -- $extra_config_file = FILESENDER_BASE.'/config/config-' . $extra_config_name . '.php'; -+ $extra_config_file = FILESENDER_CONFIG_DIR.'/config-' . $extra_config_name . '.php'; - if (file_exists($extra_config_file)) { - $config = array(); - include_once($extra_config_file); -@@ -204,7 +204,7 @@ class Config - // Load config overrides if any - $overrides_cfg = self::get('config_overrides'); - if ($overrides_cfg) { -- $overrides_file = FILESENDER_BASE.'/config/'.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json'; -+ $overrides_file = FILESENDER_CONFIG_DIR.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json'; - - $overrides = file_exists($overrides_file) ? json_decode(trim(file_get_contents($overrides_file))) : new StdClass(); - -@@ -431,7 +431,7 @@ class Config - public static function getVirtualhosts() - { - $virtualhosts = array(); -- foreach (scandir(FILESENDER_BASE.'/config') as $item) { -+ foreach (scandir(FILESENDER_CONFIG_DIR) as $item) { - if (!preg_match('`^(.+)\.conf\.php$`', $item, $match)) { - continue; - } -diff --git a/config/csrf-protector-config.php b/config/csrf-protector-config.php -index 83759ca4..ea4a3173 100755 ---- a/config/csrf-protector-config.php -+++ b/config/csrf-protector-config.php -@@ -40,7 +40,7 @@ return array( - // The following should be set correctly from your config.php - // information - "jsUrl" => $config['site_url'] . "/js/csrfprotector.js", -- "logDirectory" => FILESENDER_BASE.'/log/', -+ "logDirectory" => FILESENDER_LOG_DIR, - - // I found that leaving this with the _ as default - // caused the implicit token to be stripped -diff --git a/includes/ConfigDefaults.php b/includes/ConfigDefaults.php -index 733550e7..8d99b5f0 100644 ---- a/includes/ConfigDefaults.php -+++ b/includes/ConfigDefaults.php -@@ -224,7 +224,7 @@ $default = array( - 'log_facilities' => array( - array( - 'type' => 'file', -- 'path' => FILESENDER_BASE.'/log/', -+ 'path' => FILESENDER_LOG_DIR, - 'rotate' => 'hourly' - ) - ), -diff --git a/includes/ConfigValidation.php b/includes/ConfigValidation.php -index 5c1e7f61..b1fb57e4 100644 ---- a/includes/ConfigValidation.php -+++ b/includes/ConfigValidation.php -@@ -31,9 +31,9 @@ - */ - - // Require environment (fatal) --if(!defined('FILESENDER_BASE')) die('Missing environment'); -+if(!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) die('Missing environment'); - --if(!file_exists(FILESENDER_BASE.'/config/config.php')) -+if(!file_exists(FILESENDER_CONFIG_DIR.'/config.php')) - die('Configuration file not found'); - - ConfigValidator::addCheck('site_url', 'string'); -diff --git a/includes/init.php b/includes/init.php -index ba7fa82f..31812c54 100644 ---- a/includes/init.php -+++ b/includes/init.php -@@ -35,6 +35,8 @@ if(PHP_INT_SIZE !== 8) { - } - - define('FILESENDER_BASE', dirname( __DIR__ )); -+define('FILESENDER_CONFIG_DIR', getenv('FILESENDER_CONFIG_DIR', true) ?: (FILESENDER_BASE.'/config')); -+define('FILESENDER_LOG_DIR', getenv('FILESENDER_LOG_DIR', true) ?: (FILESENDER_BASE.'/log')); - - // Include classes autoloader - require_once(FILESENDER_BASE.'/classes/autoload.php'); diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f7633dfb2ee1..051d3a593994 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -916,6 +916,7 @@ mapAliases { ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12 FIL-plugins = fil-plugins; # Added 2024-06-12 fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19 + filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17 filet = throw "'filet' has been removed as the upstream repo has been deleted"; # Added 2025-02-07 finger_bsd = bsd-finger; # Added 2022-03-14 fingerd_bsd = bsd-fingerd; # Added 2022-03-14 From 76b41b119ec29a485ad191209f968f0906ba8422 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 17:49:52 +0200 Subject: [PATCH 39/81] simplesamlphp: remove See https://github.com/NixOS/nixpkgs/pull/312251#issuecomment-3416076466 I think it's frankly careless to merge something into nixpkgs that's two patch-releases behind the current patch-level of the _legacy branch_ of a software. Especially for security-sensitive things. On top, this got never updated even though there are two high-rated CVEs in this, i.e. CVE-2025-27773[1] and CVE-2024-52596[2]. [1] https://github.com/advisories/GHSA-46r4-f8gj-xg56 [2] https://github.com/advisories/GHSA-2x65-fpch-2fcm --- .../manual/release-notes/rl-2405.section.md | 2 +- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 + .../services/web-apps/simplesamlphp.nix | 128 ------------------ pkgs/by-name/si/simplesamlphp/package.nix | 25 ---- pkgs/top-level/aliases.nix | 1 + 7 files changed, 7 insertions(+), 155 deletions(-) delete mode 100644 nixos/modules/services/web-apps/simplesamlphp.nix delete mode 100644 pkgs/by-name/si/simplesamlphp/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 7b4080ea3f39..7f2e0f622c62 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -178,7 +178,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro - [Scrutiny](https://github.com/AnalogJ/scrutiny), a S.M.A.R.T monitoring tool for hard disks with a web frontend. Available as [services.scrutiny](#opt-services.scrutiny.enable). -- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as [services.simplesamlphp](#opt-services.simplesamlphp). +- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as `services.simplesamlphp`. - `systemd`'s `gateway`, `upload`, and `remote` services, which provide ways of sending journals across the network. Enable using [services.journald.gateway](#opt-services.journald.gateway.enable), [services.journald.upload](#opt-services.journald.upload.enable), and [services.journald.remote](#opt-services.journald.remote.enable). diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index 72a784afab78..16ce699c53f2 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -350,6 +350,8 @@ - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server. +- `simplesamlphp` has been removed since the package was severely outdated, unmaintained in nixpkgs and having known vulnerabilities. + - `networking.wireless.networks.` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this. - Revamp of the ACME certificate acquisication and renewal process to help scale systems with lots (100+) of certificates. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f00d30e89ccb..457d7923fd63 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1704,7 +1704,6 @@ ./services/web-apps/shiori.nix ./services/web-apps/sillytavern.nix ./services/web-apps/silverbullet.nix - ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/snips-sh.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 4c156727e6df..aede85d7eee8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -408,6 +408,9 @@ in services.postfixadmin has been removed since it was unmaintained in nixpkgs and the version available only supported PHP 8.1 which is EOL. '') + (mkRemovedOptionModule [ "services" "simplesamlphp" ] '' + services.simplesamlphp has been vulnerable and unmaintained in nixpkgs. + '') # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/services/web-apps/simplesamlphp.nix b/nixos/modules/services/web-apps/simplesamlphp.nix deleted file mode 100644 index 46d8b69a174b..000000000000 --- a/nixos/modules/services/web-apps/simplesamlphp.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.simplesamlphp; - - format = pkgs.formats.php { finalVariable = "config"; }; - - generateConfig = - opts: - pkgs.runCommand "simplesamlphp-config" { } '' - mkdir $out - cp ${format.generate "config.php" opts.settings} $out/config.php - cp ${format.generate "authsources.php" opts.authSources} $out/authsources.php - ''; -in -{ - meta = { - maintainers = with lib.maintainers; [ nhnn ]; - }; - - options.services.simplesamlphp = - with lib; - mkOption { - type = types.attrsOf ( - types.submodule ( - { config, ... }: - { - options = { - package = mkPackageOption pkgs "simplesamlphp" { }; - configureNginx = mkOption { - type = types.bool; - default = true; - description = "Configure nginx as a reverse proxy for SimpleSAMLphp."; - }; - phpfpmPool = mkOption { - type = types.str; - description = "The PHP-FPM pool that serves SimpleSAMLphp instance."; - }; - localDomain = mkOption { - type = types.str; - description = "The domain serving your SimpleSAMLphp instance. This option modifies only /saml route."; - }; - settings = mkOption { - type = types.submodule { - freeformType = format.type; - options = { - baseurlpath = mkOption { - type = types.str; - example = "https://filesender.example.com/saml/"; - description = "URL where SimpleSAMLphp can be reached."; - }; - }; - }; - default = { }; - description = '' - Configuration options used by SimpleSAMLphp. - See [](https://simplesamlphp.org/docs/stable/simplesamlphp-install) - for available options. - ''; - }; - - authSources = mkOption { - type = format.type; - default = { }; - description = '' - Auth sources options used by SimpleSAMLphp. - ''; - }; - - libDir = mkOption { - type = types.str; - readOnly = true; - description = '' - Path to the SimpleSAMLphp library directory. - ''; - }; - configDir = mkOption { - type = types.str; - readOnly = true; - description = '' - Path to the SimpleSAMLphp config directory. - ''; - }; - }; - config = { - libDir = "${config.package}/share/php/simplesamlphp/"; - configDir = "${generateConfig config}"; - }; - } - ) - ); - default = { }; - description = "Instances of SimpleSAMLphp. This module is designed to work with already existing PHP-FPM pool and NGINX virtualHost."; - }; - - config = lib.mkIf (cfg != { }) { - services.phpfpm.pools = lib.mapAttrs' ( - phpfpmName: opts: - lib.nameValuePair opts.phpfpmPool { phpEnv.SIMPLESAMLPHP_CONFIG_DIR = "${generateConfig opts}"; } - ) cfg; - - services.nginx.virtualHosts = lib.mapAttrs' ( - phpfpmName: opts: - lib.nameValuePair opts.localDomain ( - lib.mkIf opts.configureNginx { - locations."^~ /saml/" = { - alias = "${opts.package}/share/php/simplesamlphp/www/"; - extraConfig = '' - location ~ ^(?/saml)(?.+?\.php)(?/.*)?$ { - include ${pkgs.nginx}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${phpfpmName}.socket}; - fastcgi_intercept_errors on; - fastcgi_param SCRIPT_FILENAME $document_root$phpfile; - fastcgi_param SCRIPT_NAME /saml$phpfile; - fastcgi_param PATH_INFO $pathinfo if_not_empty; - } - ''; - }; - } - ) - ) cfg; - }; -} diff --git a/pkgs/by-name/si/simplesamlphp/package.nix b/pkgs/by-name/si/simplesamlphp/package.nix deleted file mode 100644 index 4345d70ca6ff..000000000000 --- a/pkgs/by-name/si/simplesamlphp/package.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - php, - fetchFromGitHub, - lib, -}: -php.buildComposerProject2 (finalAttrs: { - pname = "simplesamlphp"; - version = "1.19.7"; - - src = fetchFromGitHub { - owner = "simplesamlphp"; - repo = "simplesamlphp"; - tag = "v${finalAttrs.version}"; - hash = "sha256-Qmy9fuZq8MBqvYV6/u3Dg92pHHicuUhdNeB22u4hwwA="; - }; - - vendorHash = "sha256-kFRvOxSfqlM+xzFFlEm9YrbQDOvC4AA0BtztFQ1xxDU="; - - meta = { - description = "Application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)"; - homepage = "https://simplesamlphp.org"; - license = lib.licenses.lgpl21; - maintainers = with lib.maintainers; [ nhnn ]; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 051d3a593994..b3c32fff8bd5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2399,6 +2399,7 @@ mapAliases { signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16 silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12 silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12 + simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17 siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18 sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26 sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01 From b1f9e985c2b995bffd2d49553ec8f5bb042192ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Silva?= Date: Fri, 17 Oct 2025 16:51:30 +0100 Subject: [PATCH 40/81] xdg-desktop-portal-hyprland: 1.3.10 -> 1.3.11 --- .../hyprwm/xdg-desktop-portal-hyprland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index f8391e555cb0..dffe4664239a 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -28,13 +28,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; tag = "v${finalAttrs.version}"; - hash = "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0="; + hash = "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM="; }; depsBuildBuild = [ From b313801450b769902cf4a18c80ef354a8b9a1a93 Mon Sep 17 00:00:00 2001 From: Mysaa Java Date: Fri, 17 Oct 2025 18:59:18 +0200 Subject: [PATCH 41/81] ocamlPackages.elpi: 3.4.1 -> 3.4.2 --- pkgs/development/ocaml-modules/elpi/default.nix | 3 ++- pkgs/development/rocq-modules/rocq-elpi/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 8375c0148af0..e14516dbc403 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -18,7 +18,7 @@ coqPackages, version ? if lib.versionAtLeast ocaml.version "4.13" then - "3.4.1" + "3.4.2" else if lib.versionAtLeast ocaml.version "4.08" then "1.20.0" else @@ -34,6 +34,7 @@ in let fetched = coqPackages.metaFetch { + release."3.4.2".sha256 = "sha256-w7GjKYZrVrfezJN0NLmzpVm6CFGVKxXszHADFGCw5cc="; release."3.4.1".sha256 = "sha256-3rQPw91dHAqp61KTHk1UOEqh5syWrZZ1V1/1eE8cyI8="; release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd"; release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc="; diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix index 487d89931196..890395f7af27 100644 --- a/pkgs/development/rocq-modules/rocq-elpi/default.nix +++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix @@ -17,7 +17,7 @@ let in with lib.versions; lib.switch rocq-core.rocq-version [ - (case (range "9.0" "9.1") "3.4.1") + (case (range "9.0" "9.1") "3.4.2") (case (range "9.0" "9.1") "2.0.7") ] { }; elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; }; From dc0382561b42b184ae319aa8195ea4c89fa1cf25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 17:02:22 +0000 Subject: [PATCH 42/81] prefect: 3.4.23 -> 3.4.24 --- pkgs/by-name/pr/prefect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix index dde46659f0be..2b56f9875b0a 100644 --- a/pkgs/by-name/pr/prefect/package.nix +++ b/pkgs/by-name/pr/prefect/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "prefect"; - version = "3.4.23"; + version = "3.4.24"; pyproject = true; # Trying to install from source is challenging @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { # Source will be missing sdist, uv.lock, ui artefacts ... src = fetchPypi { inherit pname version; - hash = "sha256-XGgAc3vVd+3gcPo4UvYII1xxXnKol9Qf07kxf2f96MM="; + hash = "sha256-jBDHgGNZRl1nr5qpj/5r5+D7o1skFFPcd6yTe60uMlE="; }; pythonRelaxDeps = [ From 7247f9f4ce60b519175d2364a9ea75e085594551 Mon Sep 17 00:00:00 2001 From: SandWood Jones Date: Thu, 16 Oct 2025 13:04:01 -0300 Subject: [PATCH 43/81] trashy: added manpage --- pkgs/by-name/tr/trashy/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix index 372878772b22..29f0bf8cc70b 100644 --- a/pkgs/by-name/tr/trashy/package.nix +++ b/pkgs/by-name/tr/trashy/package.nix @@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/trash completions bash) \ --fish <($out/bin/trash completions fish) \ --zsh <($out/bin/trash completions zsh) \ + + installManPage --name trashy.1 <($out/bin/trash manpage) ''; meta = { From 049f576a2e12c4a5fe20766a0b87da130a32b986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 17:36:18 +0000 Subject: [PATCH 44/81] remnote: 1.21.8 -> 1.21.9 --- pkgs/by-name/re/remnote/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix index 7a490b8baf6b..e83afc7a0d0d 100644 --- a/pkgs/by-name/re/remnote/package.nix +++ b/pkgs/by-name/re/remnote/package.nix @@ -6,10 +6,10 @@ }: let pname = "remnote"; - version = "1.21.8"; + version = "1.21.9"; src = fetchurl { url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage"; - hash = "sha256-KJHdLHmLGYYxv4eKCDoUsTn3bhWg3h8QOlwmtxNFC6Y="; + hash = "sha256-ywVNcB15Qp150gdhnweNMjYyI8w80tNxVXNDvv01Dpg="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From 3ef83a186ee09cd479c0aecad24112c06757f576 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 18:35:16 +0000 Subject: [PATCH 45/81] protoc-gen-swift: 1.29.0 -> 1.32.0 --- pkgs/by-name/pr/protoc-gen-swift/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix index c0635e0868c2..939702ab34ca 100644 --- a/pkgs/by-name/pr/protoc-gen-swift/package.nix +++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "protoc-gen-swift"; - version = "1.29.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "apple"; repo = "swift-protobuf"; rev = "${finalAttrs.version}"; - hash = "sha256-UPYwu8SiBUHofqHdUT6uxdeY2WUXYqbkLj+h4chSCa4="; + hash = "sha256-YirKJjEA5zFVVs8U1/D3TYCgv+3FMO7dusCZ7ZuIeZs="; }; nativeBuildInputs = [ From 0f58a0e06dac78ffd3813af83b8e8d4b1aaf8bc5 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 18 Oct 2025 03:42:36 +0900 Subject: [PATCH 46/81] zeyple: add missing pre/post hooks --- pkgs/by-name/ze/zeyple/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ze/zeyple/package.nix b/pkgs/by-name/ze/zeyple/package.nix index 7bf788f6ea8d..7e72eae1652e 100644 --- a/pkgs/by-name/ze/zeyple/package.nix +++ b/pkgs/by-name/ze/zeyple/package.nix @@ -19,7 +19,11 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = [ python3Packages.gpgme ]; installPhase = '' + runHook preInstall + install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple + + runHook postInstall ''; meta = with lib; { From dc7922ec7618f53e087dce8b8f87c1c53b566402 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 18 Oct 2025 03:43:23 +0900 Subject: [PATCH 47/81] zeyple: patch renamed python stdlib feature --- pkgs/by-name/ze/zeyple/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ze/zeyple/package.nix b/pkgs/by-name/ze/zeyple/package.nix index 7e72eae1652e..943cf8dc9c10 100644 --- a/pkgs/by-name/ze/zeyple/package.nix +++ b/pkgs/by-name/ze/zeyple/package.nix @@ -17,11 +17,17 @@ python3Packages.buildPythonApplication { sha256 = "0r2d1drg2zvwmn3zg0qb32i9mh03r5di9q1yszx23r32rsax9mxh"; }; + # SafeConfigParser was deprecated in Python 3.12: https://github.com/infertux/zeyple/issues/76 + postPatch = '' + substituteInPlace zeyple/zeyple.py \ + --replace-fail 'from configparser import SafeConfigParser' 'from configparser import ConfigParser as SafeConfigParser' + ''; + propagatedBuildInputs = [ python3Packages.gpgme ]; installPhase = '' runHook preInstall - install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple + install -Dm755 zeyple/zeyple.py $out/bin/zeyple runHook postInstall ''; From c5689a81b1cc3516ed837e1d530ef7cd0adab9cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 19:17:31 +0000 Subject: [PATCH 48/81] pgmodeler: 1.2.1 -> 1.2.2 --- pkgs/by-name/pg/pgmodeler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix index d076d7493aaa..6d73a7096d14 100644 --- a/pkgs/by-name/pg/pgmodeler/package.nix +++ b/pkgs/by-name/pg/pgmodeler/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-DIyqUewP8q9O6O/v82a2DNgyrBffWkBmyhBm3pA1qVY="; + sha256 = "sha256-gDhH6b+8zFIsosdecUUkwAQMP1HME4EbJZsFyTzvGcE="; }; nativeBuildInputs = [ From 28233c66015badf3a0843928f7db61a916c8ce06 Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Fri, 17 Oct 2025 15:19:11 -0400 Subject: [PATCH 49/81] forgejo: 13.0.0 -> 13.0.1 changelog: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/13.0.1.md --- pkgs/by-name/fo/forgejo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index acd8d35f67e3..fa6f913ef6b2 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "13.0.0"; - hash = "sha256-8NRUJpf25Bai0NtzYf2APmOt3rqpP9mPM13KMjNLl2M="; + version = "13.0.1"; + hash = "sha256-P8ZIBV0pVo3cn9Yroe67Bt+/7KEdz/gBGSypmUz5V2g="; npmDepsHash = "sha256-7WjcMsKPtKUWJfDrJc65ZXq2tjK8+8DnqwINj+0XyiQ="; vendorHash = "sha256-PHItbU27d9ouykUlhr9owylMpF+3wz2vc8c0UTR1RVU="; lts = false; From 03082c7e38f14f1ece3ccd672542c5617d9ab8ac Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Fri, 17 Oct 2025 13:49:19 +0200 Subject: [PATCH 50/81] senpai: install desktop file and icons --- pkgs/by-name/se/senpai/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix index f204aa91bf51..ee217158ea89 100644 --- a/pkgs/by-name/se/senpai/package.nix +++ b/pkgs/by-name/se/senpai/package.nix @@ -33,6 +33,10 @@ buildGoModule rec { scdoc < doc/senpai.1.scd > doc/senpai.1 scdoc < doc/senpai.5.scd > doc/senpai.5 installManPage doc/senpai.* + install -D -m 444 -t $out/share/applications contrib/senpai.desktop + install -D -m 444 res/icon.48.png $out/share/icons/hicolor/48x48/apps/senpai.png + install -D -m 444 res/icon.128.png $out/share/icons/hicolor/128x128/apps/senpai.png + install -D -m 444 res/icon.svg $out/share/icons/hicolor/scalable/apps/senpai.svg ''; passthru.updateScript = nix-update-script { }; From 98135ce14f3f23e69754beca69bfd915b2a62a1f Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 17 Oct 2025 02:21:43 +0200 Subject: [PATCH 51/81] forgejo: fix `checkPhase` regression This fixes a regression introduced in 5de92a8b79f3e0c3fcf75de3c7b6e5e38890732f. Forgejo v13 made the GO_TEST_PACKAGES variable lazy in [1], which causes our custom show-backend-tests make target to return an empty string, which in turn causes our checkPhase to not run a single go test. To fix this, we need to slightly modify our custom make target to reference the newly introduced compute-go-test-packages target as a dependency. [1]: https://codeberg.org/forgejo/forgejo/pulls/9208 --- pkgs/by-name/fo/forgejo/generic.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index f2c0c7f8ddbd..1db5124e8fd5 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -105,11 +105,12 @@ buildGoModule rec { export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)" ''; + # expose and use the GO_TEST_PACKAGES var from the Makefile + # instead of manually copying over the entire list: + # https://codeberg.org/forgejo/forgejo/src/tag/v11.0.6/Makefile#L128 + # https://codeberg.org/forgejo/forgejo/src/tag/v13.0.0/Makefile#L290 preCheck = '' - # expose and use the GO_TEST_PACKAGES var from the Makefile - # instead of manually copying over the entire list: - # https://codeberg.org/forgejo/forgejo/src/tag/v7.0.4/Makefile#L124 - echo -e 'show-backend-tests:\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile + echo -e 'show-backend-tests:${lib.optionalString (lib.versionAtLeast version "13") " | compute-go-test-packages"}\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile getGoDirs() { make show-backend-tests } From ad5416e3d3f285dffd36a5cd9af8e1a85e58bacd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 19:40:18 +0000 Subject: [PATCH 52/81] fzf-make: 0.63.0 -> 0.65.0 --- pkgs/by-name/fz/fzf-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 8b55c7588ec2..9f8bb9a1b299 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.63.0"; + version = "0.65.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-waSi5zqUy9Rfb/knoKACPLJy7qEWdZa/AX6xGFUYhoU="; + hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo="; }; - cargoHash = "sha256-KniWZ/ASfStUodUfNSDtPmScR/egOkGABVMcUuIdUM0="; + cargoHash = "sha256-QaR0Se8ecNKj7OcngwEOrK63VT200D+/Xm3RaIiLdec="; nativeBuildInputs = [ makeBinaryWrapper ]; From c88944683743ee0babb6da9426bcdeb9a21f1e14 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:14:59 +0200 Subject: [PATCH 53/81] deployer: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/de/deployer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/de/deployer/package.nix b/pkgs/by-name/de/deployer/package.nix index c75b5e1d27a7..9423c04e1a55 100644 --- a/pkgs/by-name/de/deployer/package.nix +++ b/pkgs/by-name/de/deployer/package.nix @@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-wtkixHexsJNKsLnnlHssh0IzxwWYMPKDcaf/D0zUNKk="; }; - vendorHash = "sha256-0uBI30n31W0eDVA9/W366O0Qo2jWZBqEL+YbJx4J7P0="; + vendorHash = "sha256-/bf1rvoG1N6GNqisBwMqY05qhTsy7gMeWXarXgElU/M="; meta = { changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}"; From 4eee7a99dfaa9dcee3eea6c69e79481a2523d573 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:15:33 +0200 Subject: [PATCH 54/81] composer-require-checker: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/co/composer-require-checker/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 1a914083b8d8..239debebbb08 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-UAofdc8mqSnJXhCTABSf9JZERqur86lzNDI66EHgEQE="; }; - vendorHash = "sha256-bNeQEfwXly3LFuEKeSK6J6pRfQF6TNwUqu3SdTswmFI="; + vendorHash = "sha256-TlBrL4KyMVHaxqlfvnTkj3TkmU8h5/0BRC5e8yWrhCI="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From 5bb0fdf52c78a962e2dfbbd4ec3154b1dca5f247 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:16:06 +0200 Subject: [PATCH 55/81] roave-backward-compatibility-check: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/ro/roave-backward-compatibility-check/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix index 3200cfe2af7e..2c1c0a83957d 100644 --- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix +++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix @@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-4rhIaPdyyLiIhVYC4KNKbPAbVsHKnK6BOsebFjmmDeI="; }; - vendorHash = "sha256-k+zFpBHE+r0a67gqUry+luMIhJZ5wo1RpEaF4c7vAmI="; + vendorHash = "sha256-uZqstfVp5uY7Sec32XLK7RvuUtP8Hj21W7tayhhuf2g="; nativeInstallCheckInputs = [ versionCheckHook From a7b12f2bd9e01ceab9247eeb7acfe9a2c40290b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:16:25 +0200 Subject: [PATCH 56/81] robo: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/ro/robo/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix index c1e0ee1fc92c..480fe8ebeb24 100644 --- a/pkgs/by-name/ro/robo/package.nix +++ b/pkgs/by-name/ro/robo/package.nix @@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: { hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg="; }; - vendorHash = "sha256-vketnTu5VEgt3HBbtnTppWl3+sSSIsCB2MpvL27bxv4="; + vendorHash = "sha256-Rg8WTZUnWA4bemNmE7hxFwfnlMtYyPkeltAQEWJ2VDU="; nativeInstallCheckInputs = [ versionCheckHook From 2040e5f2f004ebb649176c99033bbb483a2a62bb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:16:41 +0200 Subject: [PATCH 57/81] pdepend: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/pd/pdepend/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix index aa72fe80e91f..d8bd332f8fbe 100644 --- a/pkgs/by-name/pd/pdepend/package.nix +++ b/pkgs/by-name/pd/pdepend/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { }; composerLock = ./composer.lock; - vendorHash = "sha256-szKVZhWcd8p4307irNqgSAK2+hl8AW+gCPyf0EEco8A="; + vendorHash = "sha256-uK+nJFXDVPYFbosAUxqu+mmNsD7AnZ18NnIN9FYAaPQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 4dc2b25c7e3d92824e07d3dcef71ee450e470ade Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:17:13 +0200 Subject: [PATCH 58/81] flarum: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/fl/flarum/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix index 9d83dacbca08..0043123e347b 100644 --- a/pkgs/by-name/fl/flarum/package.nix +++ b/pkgs/by-name/fl/flarum/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { composerLock = ./composer.lock; composerStrictValidation = false; - vendorHash = "sha256-pup+ZfPEnqoA3wEXQNn4pWTYXri6d4XzMfuc8k1SeQk="; + vendorHash = "sha256-4wB8MRnqnruo9VXupMmAqiRSZx8F2i+8zcOphTeDp1g="; meta = with lib; { changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md"; From 5bc93153a8f0d4c806dd64cdd5ffdcf695218d13 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:17:38 +0200 Subject: [PATCH 59/81] movim: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/mo/movim/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 0cb5ed73e7f4..06d7be4dd40b 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -88,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-xkFyjs3jW7j+8WosRaxBEYQU2dwQlDr4/nrdtW03xvA="; + vendorHash = "sha256-Ke+bh/mvKUk5qxjlBZo4jJhLneyFRq0HYXTwK/KZMBs="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; From 7bd88ff6e3dfc82c54351df2a35f29256d92f431 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:18:13 +0200 Subject: [PATCH 60/81] agorakit: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/ag/agorakit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix index c1c9595eccac..c5f8c722327d 100644 --- a/pkgs/by-name/ag/agorakit/package.nix +++ b/pkgs/by-name/ag/agorakit/package.nix @@ -27,7 +27,7 @@ php82.buildComposerProject2 (finalAttrs: { runHook postInstall ''; - vendorHash = "sha256-tBB3Zl/N1XqPTD84at5WoGrD0G5rJbobk4E8BFOSm+M="; + vendorHash = "sha256-cg9OIBvWX69yU6U6Ag/T3jScG2OUdpTqc+KwP6VyUHo="; composerStrictValidation = false; passthru.updateScript = nix-update-script { }; From 8b54db6167dc7cb36b28a9309d386929852b003b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:18:35 +0200 Subject: [PATCH 61/81] engelsystem: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/en/engelsystem/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/en/engelsystem/package.nix b/pkgs/by-name/en/engelsystem/package.nix index 27a089230b82..7da12fd84620 100644 --- a/pkgs/by-name/en/engelsystem/package.nix +++ b/pkgs/by-name/en/engelsystem/package.nix @@ -23,7 +23,7 @@ php.buildComposerProject2 (finalAttrs: { inherit php; - vendorHash = "sha256-0Mv48mB/pTQtYd2do6wTdhD/c2zwbU1gTYsdU7rELPY="; + vendorHash = "sha256-ODJgsvECw+q3sAA6pWNw4X2Png7f4G2Jty9AQSj/SgE="; composoerNoDev = true; composerStrictValidation = false; From 5f83b2cbd64687afa211bfb03fb050ae9f18eba2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:19:15 +0200 Subject: [PATCH 62/81] pest: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/pe/pest/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix index 6cc3bbb88e97..a5be5a24b227 100644 --- a/pkgs/by-name/pe/pest/package.nix +++ b/pkgs/by-name/pe/pest/package.nix @@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: { }; composerLock = ./composer.lock; - vendorHash = "sha256-rOJ6PFp4Xfe89usoH455EAT30d2Tu3zd3+C/6K/kGBw="; + vendorHash = "sha256-4CpyerXmfXbwsNsK16V+GY3Rzo4BfavGpOVITD14p8w="; meta = { changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}"; From b9f3829c78bc6f79f6fea0b3299549eb6b2a3d9b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:19:30 +0200 Subject: [PATCH 63/81] pretty-php: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/pr/pretty-php/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix index 35a132174ecc..3e8a806249f8 100644 --- a/pkgs/by-name/pr/pretty-php/package.nix +++ b/pkgs/by-name/pr/pretty-php/package.nix @@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-zBhxuEViLxeQ9m3u1L0wYqeL+YEWWwvJS7PtsFPO5QU="; }; - vendorHash = "sha256-vnmp/HLzaOzHu22lzugRXIHL43YQ/hm223gcUbIiLT4="; + vendorHash = "sha256-Y1/wNFPXza2aO07ZFybpwI3XbTVBhEvFHs9ygHQbcSo="; passthru = { tests.version = testers.testVersion { From 47d251327cc876f675e6a61af8eb94b6f284e033 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:19:46 +0200 Subject: [PATCH 64/81] phpactor: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/ph/phpactor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 402970157526..96310ff421b7 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-9XWlWwq+xvqPgKIc7IGoMVTxajjYsrPo/ra/0JIE168="; }; - vendorHash = "sha256-3xkt0QjytW4BOCgZdevat7zkSuZTPPvwz3yptiq5zoo="; + vendorHash = "sha256-91Yz78nh4r+Gr7gKSwelTdO436ehENVTPUWcnDaU7zg="; nativeBuildInputs = [ installShellFiles ]; From ae68d8ca7b44ca06aaa27b363ae7ceaa02ad1a01 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:20:09 +0200 Subject: [PATCH 65/81] phpdocumentor: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/ph/phpdocumentor/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix index 92e583031735..6026aacb1073 100644 --- a/pkgs/by-name/ph/phpdocumentor/package.nix +++ b/pkgs/by-name/ph/phpdocumentor/package.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-iQA19FrXvVLzg+LaY1BcNmG8amMfKPVFwYbZ7dr+H9Q="; }; - vendorHash = "sha256-sFRy9Hy9CVNjjYqbPbKH0XhoUdu4HlkiuHDDovTGono="; + vendorHash = "sha256-iXkj0Pa4ln8GX/ARCpnijaWdFM4VYZuj42RP0GS2LW8="; nativeBuildInputs = [ makeBinaryWrapper ]; From 5e1ac99aecc40d07fde85a2b9391bddfd40c6088 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:20:28 +0200 Subject: [PATCH 66/81] grocy: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/by-name/gr/grocy/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix index ee2b76bd91a4..94fc34a56679 100644 --- a/pkgs/by-name/gr/grocy/package.nix +++ b/pkgs/by-name/gr/grocy/package.nix @@ -19,7 +19,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-MnN6TIkNZWT+pAQf0+z5l3hj/7K/d3BfI7VAaUEKG8s="; }; - vendorHash = "sha256-n+6yNXqarWRZt6VEuHrFe3nrTiGeHnkURmO2UuB/BVc="; + vendorHash = "sha256-6vWV8+4tETUFBLeEoG7d8lHKILXvM7ezWbDiG11GA/s="; offlineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; From 13b803083352825427606958e0b5545cf1303942 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:25:37 +0200 Subject: [PATCH 67/81] psysh: mark as broken, remove teams.php I'm strongly against the PHP team maintaining packages just because they happen to be written in PHP. Also, $ nix-build -A psysh.composerVendor --check checking outputs of '/nix/store/1mpgxnyzw18bv824drzi05k6mxb9znss-psysh-composer-vendor-0.12.7.drv'... /nix/store/nxza0ss75gbgwycsld0gyw1m729271j9-composer-vendor-hook.sh/nix-support/setup-hook: line 13: composerNoDev: unbound variable error: builder for '/nix/store/1mpgxnyzw18bv824drzi05k6mxb9znss-psysh-composer-vendor-0.12.7.drv' failed with exit code 1 Marking as broken until somebody picks it up and performs a proper fix. --- pkgs/by-name/ps/psysh/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix index 709efc36a5f4..a286afa171f5 100644 --- a/pkgs/by-name/ps/psysh/package.nix +++ b/pkgs/by-name/ps/psysh/package.nix @@ -58,6 +58,7 @@ php.buildComposerProject2 (finalAttrs: { mainProgram = "psysh"; license = lib.licenses.mit; homepage = "https://psysh.org/"; - teams = [ lib.teams.php ]; + # `composerVendor` doesn't build + broken = true; }; }) From 9120cb1f396e977bab3f1e6b4bbaa66265a2b8bf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:28:09 +0200 Subject: [PATCH 68/81] baikal: mark as broken The diff between expected and got path is --- /nix/store/7ci5x0qh7vzcqk7pnhdzbqcsr6mp0km3-baikal-composer-vendor-0.10.1/vendor/bin/sabredav 1970-01-01 01:00:01.000000000 +0100 +++ /nix/store/1r5n9z4xkbs33zwbdz7sh2ys1vaqphc8-baikal-composer-vendor-0.10.1/vendor/bin/sabredav 1970-01-01 01:00:01.000000000 +0100 @@ -7,7 +7,7 @@ selfArg="$0" fi -self=$(realpath $selfArg 2> /dev/null) +self=$(realpath "$selfArg" 2> /dev/null) if [ -z "$self" ]; then self="$selfArg" fi This is not explainable by the composer update. Hence, marking as broken until the maintainers figure out a solution. --- pkgs/by-name/ba/baikal/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ba/baikal/package.nix b/pkgs/by-name/ba/baikal/package.nix index 32213d3922ff..08103ccf5225 100644 --- a/pkgs/by-name/ba/baikal/package.nix +++ b/pkgs/by-name/ba/baikal/package.nix @@ -21,5 +21,7 @@ php.buildComposerProject2 (finalAttrs: { homepage = "https://sabre.io/baikal/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ wrvsrx ]; + # vendorHash non-reproducible + broken = true; }; }) From 6a97a2344c10672dbaafd452c8b79f47068bd522 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:36:05 +0200 Subject: [PATCH 69/81] phpPackages.phive: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/phive/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix index 5d0a9f26b1b3..35c108c5200d 100644 --- a/pkgs/development/php-packages/phive/default.nix +++ b/pkgs/development/php-packages/phive/default.nix @@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: { hash = "sha256-dv9v1KCLNheFmrRQ7cID5WFvoiH0OWVPWSrN023dEqA="; }; - vendorHash = "sha256-H1QJ+ML0tbZzEBKknP0GHhUhw+ujiIH/QNmEgA2zSmM="; + vendorHash = "sha256-U6BHAd4tWQKm6uCJ5sM51PltXhF3J4ieTnbC060+8Jg="; meta = { changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}"; From 78c0fd2b0888d2badae3448afcaeed7e8194ba36 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:36:19 +0200 Subject: [PATCH 70/81] phpPackages.php-parallel-lint: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/php-parallel-lint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix index bed0420642c7..e7f93224f1ab 100644 --- a/pkgs/development/php-packages/php-parallel-lint/default.nix +++ b/pkgs/development/php-packages/php-parallel-lint/default.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { }; composerLock = ./composer.lock; - vendorHash = "sha256-ySdLlqlGKZ6LgmAOBMkBNoCAqWrgMwE/Cj6ZEPEsCko="; + vendorHash = "sha256-AQAASj5vrSE1xkJ/SZHU4GwOWNobe9ES0Yo+YrLH354="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 52568d69618a9f96b3fc75331417ae9e56e80dcf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:36:37 +0200 Subject: [PATCH 71/81] phpPackages.phpinsights: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/phpinsights/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 5562277b4cd7..13d0ebf7b640 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: { }; composerLock = ./composer.lock; - vendorHash = "sha256-CwIfRmwJREz24Qj6J2PKQp+ix+/ZXo1oamcHc1fPUoc="; + vendorHash = "sha256-uy8/bkgjDXnt544S70IOwX9I8U0lMLAkbiBDYXyJBcY="; nativeInstallCheckInputs = [ versionCheckHook From 5e612de4127f4862a45c29709f4bc2ebc1f8062e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:36:56 +0200 Subject: [PATCH 72/81] phpPackages.box: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/box/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 2c998d510279..8d43a6d27127 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: { hash = "sha256-giJAcH2R9hAlUTbwRi7rbmUP+WV8Nfb9XmoHHs4RcbI="; }; - vendorHash = "sha256-7oZtuQ7PhB7q9vNO2TLI46kg2q9BgdLjGUduGXAHc0E="; + vendorHash = "sha256-A/hAw0J4Q3kun6soxI6h7kpyGef9q0EFg8HAQHHZUro="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; From c75ff9ff2e6026e56fc9b52f08658bb04d700f4a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:37:12 +0200 Subject: [PATCH 73/81] phpPackages.phpmd: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/phpmd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index c254fe239871..06533e74a241 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -19,7 +19,7 @@ php.buildComposerProject2 (finalAttrs: { # Missing `composer.lock` from the repository. # Issue open at https://github.com/phpmd/phpmd/issues/1056 composerLock = ./composer.lock; - vendorHash = "sha256-AahAs3Gq1OQ+CW3+rU8NnWcR3hKzVNq7s3llsO4mQ38="; + vendorHash = "sha256-tiL8PL6Muc/i4Il1rCeEKenCmIEVn3rHFZInbUGQW9o="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; From a61d468940fe58b7d4238731e46e0af00e84b26a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:37:27 +0200 Subject: [PATCH 74/81] phpPackages.phing: fix composer hash Confirmed with diffoscope that only the composer-generated code did change. See #451395 --- pkgs/development/php-packages/phing/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix index 6edfcbe0426a..7d76d08f7753 100644 --- a/pkgs/development/php-packages/phing/default.nix +++ b/pkgs/development/php-packages/phing/default.nix @@ -17,7 +17,7 @@ hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU="; }; - vendorHash = "sha256-3frpoQzHtJA2/jJpZT+yIRatEwiY6LIUGzEZBa8hXbM="; + vendorHash = "sha256-zrHOw7Uyq8H7AyxrfCo5VthX1EeoSB44ynrRt38u3Sk="; nativeInstallCheckInputs = [ versionCheckHook From c965f5142f27d400307bf09209847d3be3ff954c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 15:40:32 +0200 Subject: [PATCH 75/81] doc: add warning about composer bug --- doc/languages-frameworks/php.section.md | 6 ++++++ pkgs/development/php-packages/composer/default.nix | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 9f221679ce22..a61c27db84a3 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -214,6 +214,12 @@ code, while others choose not to. In Nix, there are multiple approaches to building a Composer-based project. +::: {.warning} +`buildComposerProject2` has a [known bug](https://github.com/NixOS/nixpkgs/issues/451395) +where the `vendorHash` changes every a Composer release happens that changes the +`autoload.php` or vendored composer code. +::: + One such method is the `php.buildComposerProject2` helper function, which serves as a wrapper around `mkDerivation`. diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index e44f8f9777a6..c36e401e3b15 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -14,6 +14,13 @@ versionCheckHook, }: +/* + XXX IMPORTANT + + Make sure to check if the `vendorHash` of `buildComposerProject2` changes when updating! + See https://github.com/NixOS/nixpkgs/issues/451395 +*/ + stdenvNoCC.mkDerivation (finalAttrs: { pname = "composer"; version = "2.8.12"; From 48bc243a6338381a24e0317b8ee3252cfcba86f2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Oct 2025 16:14:48 +0200 Subject: [PATCH 76/81] doc/php: fix typo Co-authored-by: Blui42 <61911304+Blui42@users.noreply.github.com> --- doc/languages-frameworks/php.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index a61c27db84a3..988fa659f0aa 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -216,7 +216,7 @@ In Nix, there are multiple approaches to building a Composer-based project. ::: {.warning} `buildComposerProject2` has a [known bug](https://github.com/NixOS/nixpkgs/issues/451395) -where the `vendorHash` changes every a Composer release happens that changes the +where the `vendorHash` changes every time a Composer release happens that changes the `autoload.php` or vendored composer code. ::: From 0ce964a8b273893dfff8c54b67704f330012b73e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 17 Oct 2025 22:15:42 +0100 Subject: [PATCH 77/81] QuadProgpp: fix cmake-4 build Without the change the build on cmake-4 fails as https://hydra.nixos.org/build/308951858: CMake Error at CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 has been removed from CMake. --- pkgs/by-name/qu/QuadProgpp/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/qu/QuadProgpp/package.nix b/pkgs/by-name/qu/QuadProgpp/package.nix index d7306f01ba98..35bab2a1eec9 100644 --- a/pkgs/by-name/qu/QuadProgpp/package.nix +++ b/pkgs/by-name/qu/QuadProgpp/package.nix @@ -20,6 +20,13 @@ stdenv.mkDerivation { cmake ]; + postPatch = '' + # Inline https://github.com/liuq/QuadProgpp/pull/32 + substituteInPlace CMakeLists.txt --replace-fail \ + 'cmake_minimum_required(VERSION 3.0)' \ + 'cmake_minimum_required(VERSION 3.10)' + ''; + meta = with lib; { description = "C++ library for Quadratic Programming"; longDescription = '' From f4162355f7deda884e5415cd30c317371edaa80c Mon Sep 17 00:00:00 2001 From: Daniel Fahey Date: Fri, 17 Oct 2025 22:42:54 +0100 Subject: [PATCH 78/81] python3Packages.vllm: fix hash after upstream tag was moved The v0.11.0 tag was moved - to https://github.com/vllm-project/vllm/commit/b8b302cde434df8c9289a2b465406b47ebab1c2d - from its parent https://github.com/vllm-project/vllm/commit/f71952c1c49fb86686b0b300b727b26282362bf4 --- pkgs/development/python-modules/vllm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 131138132608..d710af5d7a93 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -282,7 +282,7 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${version}"; - hash = "sha256-uYK/e9McEyrDTACMk5S0cGCjai9rf6HMR9dpPL7ISYc="; + hash = "sha256-47TPvvPQvVbh6Gm2yvi+xhWZ8tSma91rp9hp/SBrEY8="; }; patches = [ From 29233239a85c155b1032aa3af0694bc5e67cace8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 22:02:08 +0000 Subject: [PATCH 79/81] matrix-gtk-theme: 0-unstable-2025-07-28 -> 0-unstable-2025-10-15 --- pkgs/by-name/ma/matrix-gtk-theme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix index 10f102b3f254..10667e95ac77 100644 --- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix +++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix @@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2025-07-28"; + version = "0-unstable-2025-10-15"; src = fetchFromGitHub { owner = "D3vil0p3r"; repo = "Matrix-GTK-Theme"; - rev = "fe8152fff81630efca6dedefe4b7f766fb2700f9"; - hash = "sha256-maGRPw9qeKTy5JzDvrQIYe2zi4plhDu4NgjevizTAEE="; + rev = "d76d8c69cb1fca0f050009ee5893c65954f3ddfe"; + hash = "sha256-RJKHSBj33QR9ahkMd2HwG7FCUB8gtfTzIp0174TPHPE="; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From 313d0d4730e66609d4d91a6cf59cdb502579aa70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 22:05:17 +0000 Subject: [PATCH 80/81] windsurf: 1.12.16 -> 1.12.21 --- pkgs/by-name/wi/windsurf/info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index abba0fc641e3..c77fe388253f 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.12.16", + "version": "1.12.21", "vscodeVersion": "1.100.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-arm64-1.12.16.zip", - "sha256": "c18f78671472b03bf06f48f966f4674c2a3adf1b55febf4ea6dddd87d455255d" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-darwin-arm64-1.12.21.zip", + "sha256": "6fefd31c02779b26938fcba1ca999311ee5ef6844e2dac81d504f2b4d6a0248e" }, "x86_64-darwin": { - "version": "1.12.16", + "version": "1.12.21", "vscodeVersion": "1.100.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-x64-1.12.16.zip", - "sha256": "c23ef27510bb321cba5cdefdba4a4118f2b3f1904caf521981d514e16fa14667" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-darwin-x64-1.12.21.zip", + "sha256": "eabd42f053f2d36ac1ac58c03d44cf22250d9fa064e625408db6356582a24812" }, "x86_64-linux": { - "version": "1.12.16", + "version": "1.12.21", "vscodeVersion": "1.100.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-linux-x64-1.12.16.tar.gz", - "sha256": "e335bfbcdec5a919ea1bf8fdc0acde52df8a8a95ea0019c7c8c56513b119d3e5" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-linux-x64-1.12.21.tar.gz", + "sha256": "62323e395ec5981f45ecfdbc95eb875b712365b211cdf173596eed782f66da0f" } } From 36b4d9303233c12c86a69a264b45c2cc5c70ef56 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 17 Oct 2025 22:50:27 +0000 Subject: [PATCH 81/81] empire-compiler: 0.4.0 -> 0.4.1 --- pkgs/by-name/em/empire-compiler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/em/empire-compiler/package.nix b/pkgs/by-name/em/empire-compiler/package.nix index 87f19ff2fef0..bc1274d991d5 100644 --- a/pkgs/by-name/em/empire-compiler/package.nix +++ b/pkgs/by-name/em/empire-compiler/package.nix @@ -9,13 +9,13 @@ buildDotnetModule (finalAttrs: { pname = "empire-compiler"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "bc-security"; repo = "empire-compiler"; tag = "v${finalAttrs.version}"; - hash = "sha256-DzX78ks+fWjv170c7IGZHWnWhhBnrI8ueTL7hxIhJb0="; + hash = "sha256-BuNg5RetGEV/YAZnZP7rkMHif9NczOx2e4OAVDjafuI="; }; postPatch = ''