From 67781475658634f92e1d09a503a716982011842f Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 18 Apr 2025 08:05:27 +0800 Subject: [PATCH 01/70] crypto-org-wallet: 0.1.1 -> 1.5.1 --- pkgs/by-name/cr/crypto-org-wallet/package.nix | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/cr/crypto-org-wallet/package.nix b/pkgs/by-name/cr/crypto-org-wallet/package.nix index 8d9dd44be874..1456085acbd6 100644 --- a/pkgs/by-name/cr/crypto-org-wallet/package.nix +++ b/pkgs/by-name/cr/crypto-org-wallet/package.nix @@ -5,33 +5,31 @@ imagemagick, }: -let +appimageTools.wrapAppImage rec { pname = "chain-desktop-wallet"; - version = "0.1.1"; + version = "1.5.1"; - src = fetchurl { - url = "https://github.com/crypto-com/${pname}/releases/download/v${version}/${pname}-${version}-x86_64.AppImage"; - sha256 = "12076hf8dlz0hg1pb2ixwlslrh8gi6s1iawnvhnn6vz4jmjvq356"; + src = appimageTools.extractType2 { + inherit pname version; + src = fetchurl { + url = "https://github.com/crypto-com/chain-desktop-wallet/releases/download/v${version}/Crypto.com-DeFi-Desktop-Wallet-${version}.AppImage"; + hash = "sha256-dXJMU6abg31ZyETKl5Hh6fxn1Gd1FbSHGJh1z0R7XPM="; + }; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 rec { - inherit pname version src; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop - ${imagemagick}/bin/convert ${appimageContents}/${pname}.png -resize 512x512 ${pname}_512.png - install -m 444 -D ${pname}_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' + install -m 444 -D ${src}/chain-desktop-wallet.desktop $out/share/applications/chain-desktop-wallet.desktop + ${imagemagick}/bin/magick ${src}/chain-desktop-wallet.png -resize 512x512 chain-desktop-wallet_512.png + install -m 444 -D chain-desktop-wallet_512.png $out/share/icons/hicolor/512x512/apps/chain-desktop-wallet.png + substituteInPlace $out/share/applications/chain-desktop-wallet.desktop \ + --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=chain-desktop-wallet %U" ''; - meta = with lib; { + meta = { description = "Crypto.org Chain desktop wallet (Beta)"; homepage = "https://github.com/crypto-com/chain-desktop-wallet"; - license = licenses.asl20; - maintainers = with maintainers; [ th0rgal ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ th0rgal ]; platforms = [ "x86_64-linux" ]; mainProgram = "chain-desktop-wallet"; }; From f248446f9b476826d44b46f4167eba91a6a1780d Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 6 May 2025 04:38:04 +0800 Subject: [PATCH 02/70] server-box: init at 1.0.1130-unstable-2025-04-25 --- pkgs/by-name/se/server-box/package.nix | 89 + pkgs/by-name/se/server-box/pubspec.lock.json | 2162 ++++++++++++++++++ 2 files changed, 2251 insertions(+) create mode 100644 pkgs/by-name/se/server-box/package.nix create mode 100644 pkgs/by-name/se/server-box/pubspec.lock.json diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix new file mode 100644 index 000000000000..4a763d51cfe4 --- /dev/null +++ b/pkgs/by-name/se/server-box/package.nix @@ -0,0 +1,89 @@ +{ + lib, + flutter329, + fetchFromGitHub, + autoPatchelfHook, + copyDesktopItems, + makeDesktopItem, + runCommand, + yq, + server-box, + _experimental-update-script-combinators, + gitUpdater, +}: + +flutter329.buildFlutterApplication { + pname = "server-box"; + version = "1.0.1130-unstable-2025-04-25"; + + src = fetchFromGitHub { + owner = "lollipopkit"; + repo = "flutter_server_box"; + rev = "8f09085cf30f9b48209c7c3c1e9dceac5aa5eeeb"; + hash = "sha256-D2FzL34FV+7FnxyEVi/Rm2qO3c9eQmCjlH/4pMWlU5s="; + }; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + circle_chart = "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk="; + computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8="; + dartssh2 = "sha256-bS916CwUuOKhRyymtmvMxt7vGXmlyiLep4AZsxRJ6iU="; + fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g="; + fl_lib = "sha256-+eHUpn89BI7k/MbCp09gUWGMlqLBrxOy9PgL9uXnkDI="; + plain_notification_token = "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I="; + watch_connectivity = "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM="; + xterm = "sha256-LTCMaGVqehL+wFSzWd63KeTBjjU4xCyuhfD9QmQaP0Q="; + }; + + nativeBuildInputs = [ + copyDesktopItems + autoPatchelfHook + ]; + + desktopItems = [ + (makeDesktopItem { + name = "server-box"; + exec = "server-box"; + icon = "server-box"; + genericName = "ServerBox"; + desktopName = "ServerBox"; + categories = [ "Utility" ]; + keywords = [ + "server" + "ssh" + "sftp" + "system" + ]; + }) + ]; + + postInstall = '' + install -Dm0644 assets/app_icon.png $out/share/pixmaps/server-box.png + ''; + + passthru = { + pubspecSource = + runCommand "pubspec.lock.json" + { + nativeBuildInputs = [ yq ]; + inherit (server-box) src; + } + '' + cat $src/pubspec.lock | yq > $out + ''; + updateScript = _experimental-update-script-combinators.sequence [ + (gitUpdater { rev-prefix = "v"; }) + (_experimental-update-script-combinators.copyAttrOutputToFile "server-box.pubspecSource" ./pubspec.lock.json) + ]; + }; + + meta = { + description = "Server status & toolbox"; + homepage = "https://github.com/lollipopkit/flutter_server_box"; + mainProgram = "ServerBox"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ emaryn ]; + }; +} diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json new file mode 100644 index 000000000000..8d80c4e65837 --- /dev/null +++ b/pkgs/by-name/se/server-box/pubspec.lock.json @@ -0,0 +1,2162 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "76.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.3" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.11.0" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "app_links": { + "dependency": "transitive", + "description": { + "name": "app_links", + "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.0" + }, + "app_links_linux": { + "dependency": "transitive", + "description": { + "name": "app_links_linux", + "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "app_links_platform_interface": { + "dependency": "transitive", + "description": { + "name": "app_links_platform_interface", + "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "app_links_web": { + "dependency": "transitive", + "description": { + "name": "app_links_web", + "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "7dcbd0f87fe5f61cb28da39a1a8b70dbc106e2fe0516f7836eb7bb2948481a12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.5" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "asn1lib": { + "dependency": "transitive", + "description": { + "name": "asn1lib", + "sha256": "e02d018628c870ef2d7f03e33f9ad179d89ff6ec52ca6c56bcb80bcef979867f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.2" + }, + "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" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.4" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.15" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.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": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.5" + }, + "camera": { + "dependency": "transitive", + "description": { + "name": "camera", + "sha256": "413d2b34fe28496c35c69ede5b232fb9dd5ca2c3a4cb606b14efc1c7546cc8cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "camera_android_camerax": { + "dependency": "transitive", + "description": { + "name": "camera_android_camerax", + "sha256": "13784f539c7f104766bff84e4479a70f03b29d78b208278be45c939250d9d7f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.14+1" + }, + "camera_avfoundation": { + "dependency": "transitive", + "description": { + "name": "camera_avfoundation", + "sha256": "ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.18+11" + }, + "camera_platform_interface": { + "dependency": "transitive", + "description": { + "name": "camera_platform_interface", + "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.0" + }, + "camera_web": { + "dependency": "transitive", + "description": { + "name": "camera_web", + "sha256": "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "choice": { + "dependency": "direct main", + "description": { + "name": "choice", + "sha256": "52d07065e8056beba5b26cff7786134cbfa24927b1f5bf60a05d50058597b2d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "circle_chart": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "main", + "resolved-ref": "449a3fa7e886869e87ea10ab56f99be3f16f2c1f", + "url": "https://github.com/lollipopkit/circle_chart" + }, + "source": "git", + "version": "0.0.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "cloudflare_turnstile": { + "dependency": "transitive", + "description": { + "name": "cloudflare_turnstile", + "sha256": "d13cbec55a1c4916bca1d4dbd84fbe7b655ae35a264513750fdb8250486269e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.1" + }, + "code_text_field": { + "dependency": "direct main", + "description": { + "name": "code_text_field", + "sha256": "0cbffbb2932cf82e1d022996388041de3493a476acad3fbb13e5917cac0fc5f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "computer": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.88", + "resolved-ref": "b0819c8a939e1fa6858f1a0e12ee8122db0df390", + "url": "https://github.com/lollipopkit/dart_computer" + }, + "source": "git", + "version": "3.2.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" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.8" + }, + "dartssh2": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "262f41491ec6e558f4799935924b3c222869e698", + "url": "https://github.com/lollipopkit/dartssh2" + }, + "source": "git", + "version": "2.12.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.8.0+1" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.0" + }, + "easy_isolate": { + "dependency": "direct main", + "description": { + "name": "easy_isolate", + "sha256": "5c1dd21d77af0ac82e0ce25ddda652a17b87cee56fb4d8a708e13be0a2adc180", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "encrypt": { + "dependency": "transitive", + "description": { + "name": "encrypt", + "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "fcefcf3cba32696c639e9e305a790039709d05a7139320b91bb9d300993452e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.0" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "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": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.1" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "fl_build": { + "dependency": "direct dev", + "description": { + "path": ".", + "ref": "v1.0.48", + "resolved-ref": "9a589bb5b8d8376e32fb73793e8cf7c4ec4894a5", + "url": "https://github.com/lppcg/fl_build.git" + }, + "source": "git", + "version": "1.0.0" + }, + "fl_chart": { + "dependency": "direct main", + "description": { + "name": "fl_chart", + "sha256": "5276944c6ffc975ae796569a826c38a62d2abcf264e26b88fa6f482e107f4237", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.70.2" + }, + "fl_lib": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.263", + "resolved-ref": "42579f45363029584c6fbe11f84b6aa0780339e7", + "url": "https://github.com/lppcg/fl_lib" + }, + "source": "git", + "version": "0.0.1" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_adaptive_scaffold": { + "dependency": "direct main", + "description": { + "name": "flutter_adaptive_scaffold", + "sha256": "7279d74da2f2531a16d21c2ec327308778c3aedd672dfe4eaf3bf416463501f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "flutter_displaymode": { + "dependency": "direct main", + "description": { + "name": "flutter_displaymode", + "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "flutter_highlight": { + "dependency": "direct main", + "description": { + "name": "flutter_highlight", + "sha256": "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_inappwebview": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview", + "sha256": "a8f5c9dd300a8cc7fde7bb902ae57febe95e9269424e4d08d5a1a56214e1e6ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.2.0-beta.2" + }, + "flutter_inappwebview_android": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_android", + "sha256": "2427e89d9c7b00cc756f800932d7ab8f3272d3fbc71544e1aedb3dbc17dae074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_internal_annotations": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_internal_annotations", + "sha256": "787171d43f8af67864740b6f04166c13190aa74a1468a1f1f1e9ee5b90c359cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "flutter_inappwebview_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_ios", + "sha256": "7ff65d7408e453f9a4ff38f74673aeec8cae824cba8276b4b77350262bfe356a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_macos", + "sha256": "be8b8ab0100c94ec9fc079a4d48b2bc8dd1a8b4c2647da34f1d3dae93cd5f88a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_platform_interface", + "sha256": "2c99bf767900ba029d825bc6f494d30169ee83cdaa038d86e85fe70571d0a655", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0-beta.2" + }, + "flutter_inappwebview_web": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_web", + "sha256": "6c4bb61ea9d52e51d79ea23da27c928d0430873c04ad380df39c1ef442b11f4e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0-beta.2" + }, + "flutter_inappwebview_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_inappwebview_windows", + "sha256": "0ff241f814b7caff63b9632cf858b6d3d9c35758040620a9745e5f6e9dd94d74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0-beta.2" + }, + "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_markdown": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown", + "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6+2" + }, + "flutter_markdown_latex": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown_latex", + "sha256": "839e76a84abb3632ffcebbd450cf93c7e9894af65622527d23f0084cee1bfd04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4" + }, + "flutter_math_fork": { + "dependency": "transitive", + "description": { + "name": "flutter_math_fork", + "sha256": "284bab89b2fbf1bc3a0baf13d011c1dd324d004e35d177626b77f2fc056366ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3" + }, + "flutter_native_splash": { + "dependency": "direct dev", + "description": { + "name": "flutter_native_splash", + "sha256": "edb09c35ee9230c4b03f13dd45bb3a276d0801865f0a4650b7e2a3bba61a803a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.5" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.27" + }, + "flutter_reorderable_grid_view": { + "dependency": "direct main", + "description": { + "name": "flutter_reorderable_grid_view", + "sha256": "f5db90ae62f8307daef9a884e09ed2d883838592e92185017a4431fe8e78899e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.0" + }, + "flutter_riverpod": { + "dependency": "transitive", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_svg": { + "dependency": "transitive", + "description": { + "name": "flutter_svg", + "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.17" + }, + "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" + }, + "freezed_annotation": { + "dependency": "transitive", + "description": { + "name": "freezed_annotation", + "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "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" + }, + "gtk": { + "dependency": "transitive", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "highlight": { + "dependency": "direct main", + "description": { + "name": "highlight", + "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "hive": { + "dependency": "transitive", + "description": { + "name": "hive", + "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "hive_flutter": { + "dependency": "direct main", + "description": { + "name": "hive_flutter", + "sha256": "dca1da446b1d808a51689fb5d0c6c9510c0a2ba01e22805d492c73b68e33eecc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "hive_generator": { + "dependency": "direct dev", + "description": { + "name": "hive_generator", + "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.5" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.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" + }, + "icloud_storage": { + "dependency": "transitive", + "description": { + "name": "icloud_storage", + "sha256": "fa91d9c3b4264651f01a4f5b99cffa354ffe455623b13ecf92be86d88b1e26ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "icons_plus": { + "dependency": "transitive", + "description": { + "name": "icons_plus", + "sha256": "8e2f601b8605d45dd55b106a0da084a1809125077a49574ca22e8bcd5b6e86f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.0" + }, + "image": { + "dependency": "transitive", + "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" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.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" + }, + "linked_scroll_controller": { + "dependency": "transitive", + "description": { + "name": "linked_scroll_controller", + "sha256": "e6020062bcf4ffc907ee7fd090fa971e65d8dfaac3c62baf601a3ced0b37986a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "local_auth": { + "dependency": "transitive", + "description": { + "name": "local_auth", + "sha256": "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "local_auth_android": { + "dependency": "transitive", + "description": { + "name": "local_auth_android", + "sha256": "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.48" + }, + "local_auth_darwin": { + "dependency": "transitive", + "description": { + "name": "local_auth_darwin", + "sha256": "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.3" + }, + "local_auth_platform_interface": { + "dependency": "transitive", + "description": { + "name": "local_auth_platform_interface", + "sha256": "1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "local_auth_windows": { + "dependency": "transitive", + "description": { + "name": "local_auth_windows", + "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "locale_names": { + "dependency": "transitive", + "description": { + "name": "locale_names", + "sha256": "7a89ca54072f4f13d0f5df5a9ba69337554bf2fd057d1dd2a238898f3f159374", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3-main.0" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.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": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.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": "transitive", + "description": { + "name": "package_info_plus", + "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.3.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "transitive", + "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": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.16" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "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" + }, + "pinenacl": { + "dependency": "transitive", + "description": { + "name": "pinenacl", + "sha256": "57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, + "plain_notification_token": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.23", + "resolved-ref": "5f56dc56a6670e2533b0caa7d09d31d16e6c7663", + "url": "https://github.com/lollipopkit/plain_notification_token" + }, + "source": "git", + "version": "0.0.4" + }, + "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" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.1" + }, + "pretty_qr_code": { + "dependency": "transitive", + "description": { + "name": "pretty_qr_code", + "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.2" + }, + "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" + }, + "qr": { + "dependency": "transitive", + "description": { + "name": "qr", + "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "qr_code_dart_scan": { + "dependency": "transitive", + "description": { + "name": "qr_code_dart_scan", + "sha256": "a21340c4a2ca14e2e114915940fcad166f15c1a065fed8b4fede4a4aba5bc4ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.11" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_annotation": { + "dependency": "transitive", + "description": { + "name": "riverpod_annotation", + "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "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" + }, + "screenshot": { + "dependency": "transitive", + "description": { + "name": "screenshot", + "sha256": "63817697a7835e6ce82add4228e15d233b74d42975c143ad8cfe07009fab866b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "share_plus": { + "dependency": "transitive", + "description": { + "name": "share_plus", + "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.4" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.8" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "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": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.5" + }, + "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" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "url_launcher": { + "dependency": "transitive", + "description": { + "name": "url_launcher", + "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.15" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "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": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "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": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "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_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.18" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.16" + }, + "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" + }, + "wake_on_lan": { + "dependency": "direct main", + "description": { + "name": "wake_on_lan", + "sha256": "a0db43df0cd05181f476f38ec63345a763b7d3b9d8ab25cabbff45881780cb8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1+3" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.10" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "watch_connectivity": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.85", + "resolved-ref": "13e42750a8f8dbf9a6c7890198b0dd18283a0692", + "url": "https://github.com/lollipopkit/watch_connectivity" + }, + "source": "git", + "version": "0.1.5" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "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": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "webdav_client_plus": { + "dependency": "direct main", + "description": { + "name": "webdav_client_plus", + "sha256": "0f992fe05a46674a800d9fd8fdc5c54952ff739da155c558776a62ca0c2bed3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.12.0" + }, + "window_manager": { + "dependency": "transitive", + "description": { + "name": "window_manager", + "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "direct main", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "xterm": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "v1.0.586", + "resolved-ref": "b8c73bec722055f24c5724cd2f2297859e95b6af", + "url": "https://github.com/lollipopkit/xterm.dart" + }, + "source": "git", + "version": "4.0.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "zmodem": { + "dependency": "transitive", + "description": { + "name": "zmodem", + "sha256": "3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, + "zxing_lib": { + "dependency": "transitive", + "description": { + "name": "zxing_lib", + "sha256": "870a63610be3f20009ca9201f7ba2d53d7eaefa675c154b3e8c1f6fc55984d04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + } + }, + "sdks": { + "dart": ">=3.7.0 <4.0.0", + "flutter": ">=3.29.0" + } +} From 67e81835313fcb0ba3b0eccee7439c93734e5a3f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 14 May 2025 23:49:02 +0200 Subject: [PATCH 03/70] lomiri.lomiri-gallery-app: 3.1.0 -> 3.1.1 --- .../lomiri-gallery-app/default.nix | 25 +++++-------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index a087b0f7353a..537bcaa302a8 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, cmake, @@ -25,29 +24,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-gallery-app"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitLab { owner = "ubports"; repo = "development/apps/lomiri-gallery-app"; - rev = "v${finalAttrs.version}"; - hash = "sha256-uKGPic9XYUj0rLA05i6GjLM+n17MYgiFJMWnLXHKmIU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5/mZszPEsSZqgioJ+Mc7+0gEcpUKr7n/LgyXJ20P2Zg="; }; - patches = [ - # Remove when https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/merge_requests/152 merged & in release - (fetchpatch { - name = "0001-lomiri-gallery-app-bindtextdomain.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/592eff118cb5056886b73e6698f8941c7a16f2e0.patch"; - hash = "sha256-aR/Lnzvq4RuRLI75mMd4xTGMAcijm1adSAGVFZZ++No="; - }) - (fetchpatch { - name = "0002-lomiri-gallery-app-C++ify-i18n.patch"; - url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/a7582abbe0acef4d49c77a4395bc22dbd1707ef3.patch"; - hash = "sha256-qzqTXqIYX+enoOwwV9d9fxe7tVYLuh1WkL8Ij/Qx0H0="; - }) - ]; - postPatch = '' # Make splash path in desktop file relative substituteInPlace desktop/lomiri-gallery-app.desktop.in.in \ @@ -125,7 +110,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Photo gallery application for Ubuntu Touch devices"; homepage = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app"; - changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/v${finalAttrs.version}/ChangeLog"; + changelog = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/blob/${ + if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev + }/ChangeLog"; license = with lib.licenses; [ gpl3Only cc-by-sa-30 From 8bf28aa1aab925933761308db871f1dcb98ab501 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 23 May 2025 14:42:36 +0200 Subject: [PATCH 04/70] nixosTests.lomiri-gallery-app: Optimise OCR - Generate image & video data once, ahead of time - Use wait_for_console_text to detect when we're close to displaying text - Programmatically generate per-image-format tests - Switch to fullscreen for better OCR success odds --- nixos/tests/lomiri-gallery-app.nix | 196 ++++++++++++++++------------- 1 file changed, 109 insertions(+), 87 deletions(-) diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index c7cec10d875c..c368536728c5 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -1,4 +1,8 @@ { lib, ... }: +let + imageDataDir = "gallery-app-sampledata"; + imageLabel = "Image"; +in { name = "lomiri-gallery-app-standalone"; meta.maintainers = lib.teams.lomiri.members; @@ -11,11 +15,38 @@ services.xserver.enable = true; environment = { + etc."${imageDataDir}".source = + pkgs.runCommand imageDataDir + { + nativeBuildInputs = with pkgs; [ + ffmpeg # make a video from the image + (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR + ]; + } + '' + mkdir -p $out/{Pictures,Videos} + + # Setup example data, OCR-friendly: + # - White square, black text + # - Small text for display OCR + # - Big text for gallery preview OCR + # - uppercase extension + magick -size 500x500 -background white -fill black canvas:white \ + -pointsize 20 -annotate +100+100 '${imageLabel}' \ + -pointsize 70 -annotate +100+300 '${imageLabel}' \ + $out/Pictures/output.PNG + + # Different image formats + magick $out/Pictures/output.PNG $out/Pictures/output.JPG + magick $out/Pictures/output.PNG $out/Pictures/output.BMP + magick $out/Pictures/output.PNG $out/Pictures/output.GIF + + # Video for dispatching + ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4 + ''; systemPackages = with pkgs; [ - ffmpeg # make a video from the image - (imagemagick.override { ghostscriptSupport = true; }) # example image creation mpv # URI dispatching for video support xdotool # mouse movement ] @@ -42,44 +73,30 @@ enableOCR = true; testScript = - let - imageLabel = "Image"; - in '' machine.wait_for_x() with subtest("lomiri gallery launches"): machine.succeed("lomiri-gallery-app >&2 &") - machine.sleep(2) + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Albums|Events|Photos)") machine.screenshot("lomiri-gallery_open") - machine.succeed("pkill -f lomiri-gallery-app") + machine.succeed("pgrep -afx lomiri-gallery-app >&2") + machine.succeed("pkill -efx lomiri-gallery-app >&2") + machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2") - machine.succeed("mkdir /root/Pictures /root/Videos") - # Setup example data, OCR-friendly: - # - White square, black text - # - Small text for display OCR - # - Big text for gallery preview OCR - # - uppercase extension - machine.succeed( - "magick -size 500x500 -background white -fill black canvas:white " - + "-pointsize 20 -annotate +100+100 '${imageLabel}' " - + "-pointsize 50 -annotate +100+300 '${imageLabel}' " - + "/root/Pictures/output.PNG" - ) + machine.succeed("cp -vr /etc/${imageDataDir}/* /root") - # Different image formats - machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.JPG") - machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.BMP") - machine.succeed("magick /root/Pictures/output.PNG /root/Pictures/output.GIF") - - # Video for dispatching - machine.succeed("ffmpeg -loop 1 -r 1 -i /root/Pictures/output.PNG -t 100 -pix_fmt yuv420p /root/Videos/output.MP4") - - with subtest("lomiri gallery handles files"): + with subtest("lomiri gallery finds files"): machine.succeed("lomiri-gallery-app >&2 &") - machine.sleep(2) + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})") machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories @@ -89,74 +106,79 @@ machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them machine.screenshot("lomiri-gallery_photos") - machine.succeed("xdotool mousemove 80 140 click 1") # select newest one - machine.sleep(2) - machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar + machine.succeed("xdotool mousemove 80 140 click 1") # select newest one + machine.sleep(2) + machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar + machine.sleep(2) + + # MP4 gets special treatment + with subtest("lomiri gallery handles mp4"): + machine.succeed("xdotool mousemove 935 40 click 1") # open media information machine.sleep(2) + machine.wait_for_text("MP4") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_mp4_info") + machine.send_key("esc") - with subtest("lomiri gallery handles mp4"): - machine.succeed("xdotool mousemove 870 50 click 1") # open media information + machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked + + machine.succeed("xdotool mousemove 510 380 click 1") # dispatch to system's video handler + machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start + machine.sleep(10) + machine.succeed("pgrep -u root -f mpv") # should still be playing + machine.screenshot("lomiri-gallery_mp4_dispatch") + + machine.send_key("q") + machine.wait_until_fails("pgrep mpv") # wait for video to stop + + machine.send_key("right") + '' + + + lib.concatMapStringsSep + '' + machine.send_key("right") + '' + (format: '' + with subtest("lomiri gallery handles ${format.ext}"): + machine.succeed("xdotool mousemove ${ + if format.buttonIsOffset then "900" else "940" + } 50 click 1") # open media information machine.sleep(2) - machine.wait_for_text("MP4") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_mp4_info") + machine.wait_for_text("${format.ext}") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_${format.ext}_info") machine.send_key("esc") - - machine.wait_for_text("${imageLabel}") # make sure thumbnail rendering worked - - machine.succeed("xdotool mousemove 450 350 click 1") # dispatch to system's video handler - machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start - machine.sleep(10) - machine.succeed("pgrep -u root -f mpv") # should still be playing - machine.screenshot("lomiri-gallery_mp4_dispatch") - - machine.send_key("q") - machine.wait_until_fails("pgrep mpv") # wait for video to stop - - machine.send_key("right") - - with subtest("lomiri gallery handles gif"): - machine.succeed("xdotool mousemove 870 50 click 1") # open media information - machine.sleep(2) - machine.wait_for_text("GIF") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_gif_info") - machine.send_key("esc") - machine.wait_for_text("${imageLabel}") # make sure media shows fine - machine.send_key("right") + '') + [ + { + ext = "GIF"; + buttonIsOffset = false; + } + { + ext = "BMP"; + buttonIsOffset = true; + } + { + ext = "JPG"; + buttonIsOffset = true; + } + { + ext = "PNG"; + buttonIsOffset = true; + } + ] + + '' - with subtest("lomiri gallery handles bmp"): - machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) - machine.sleep(2) - machine.wait_for_text("BMP") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_bmp_info") - machine.send_key("esc") + machine.succeed("pgrep -afx lomiri-gallery-app >&2") + machine.succeed("pkill -efx lomiri-gallery-app >&2") + machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2") - machine.wait_for_text("${imageLabel}") # make sure media shows fine - machine.send_key("right") - - with subtest("lomiri gallery handles jpg"): - machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) - machine.sleep(2) - machine.wait_for_text("JPG") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_jpg_info") - machine.send_key("esc") - - machine.wait_for_text("${imageLabel}") # make sure media shows fine - machine.send_key("right") - - with subtest("lomiri gallery handles png"): - machine.succeed("xdotool mousemove 840 50 click 1") # open media information (extra icon, different location) - machine.sleep(2) - machine.wait_for_text("PNG") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_png_info") - machine.send_key("esc") - - machine.wait_for_text("${imageLabel}") # make sure media shows fine - - machine.succeed("pkill -f lomiri-gallery-app") with subtest("lomiri gallery localisation works"): machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &") + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) machine.wait_for_text(r"(Alben|Ereignisse|Fotos)") machine.screenshot("lomiri-gallery_localised") ''; From 9293bae27b5bea7f9db6a31165b36f2607fd9758 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 25 May 2025 15:55:18 +0200 Subject: [PATCH 05/70] nixosTests.lomiri-gallery-app: Split format checks into separate tests --- nixos/tests/all-tests.nix | 2 +- nixos/tests/lomiri-gallery-app.nix | 390 +++++++++++------- .../lomiri-gallery-app/default.nix | 11 +- .../services/lomiri-thumbnailer/default.nix | 8 +- 4 files changed, 259 insertions(+), 152 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5501ffb8b92b..64f2b93d0ff9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -756,7 +756,7 @@ in lomiri-filemanager-app = runTest ./lomiri-filemanager-app.nix; lomiri-mediaplayer-app = runTest ./lomiri-mediaplayer-app.nix; lomiri-music-app = runTest ./lomiri-music-app.nix; - lomiri-gallery-app = runTest ./lomiri-gallery-app.nix; + lomiri-gallery-app = discoverTests (import ./lomiri-gallery-app.nix); lomiri-system-settings = runTest ./lomiri-system-settings.nix; lorri = handleTest ./lorri/default.nix { }; lxqt = handleTest ./lxqt.nix { }; diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index c368536728c5..104c6e51c03e 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -1,117 +1,240 @@ -{ lib, ... }: let + makeTest = import ./make-test-python.nix; imageDataDir = "gallery-app-sampledata"; imageLabel = "Image"; + + makeFormatTest = + { + file, + buttonIsOffset ? null, + customTest ? null, + }: + + makeTest ( + { pkgs, lib, ... }: + + assert lib.asserts.assertMsg ( + buttonIsOffset != null || customTest != null + ) "Must either clarify button position, or define custom test code"; + + let + format = lib.lists.last (lib.strings.splitString "." file); + in + + { + name = "lomiri-gallery-app-standalone-format-${format}"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + etc."${imageDataDir}".source = + pkgs.runCommand imageDataDir + { + nativeBuildInputs = with pkgs; [ + ffmpeg # make a video from the image + (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR + ]; + } + '' + mkdir -p $out/{Pictures,Videos} + + # Setup example data, OCR-friendly: + # - White square, black text + # - Small text for display OCR + # - Big text for gallery preview OCR + # - uppercase extension + magick -size 500x500 -background white -fill black canvas:white \ + -pointsize 20 -annotate +100+100 '${imageLabel}' \ + -pointsize 70 -annotate +100+300 '${imageLabel}' \ + $out/Pictures/output.PNG + + # Different image formats + magick $out/Pictures/output.PNG $out/Pictures/output.JPG + magick $out/Pictures/output.PNG $out/Pictures/output.BMP + magick $out/Pictures/output.PNG $out/Pictures/output.GIF + + # Video for dispatching + ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4 + ''; + systemPackages = + with pkgs; + [ + mpv # URI dispatching for video support + xdotool # mouse movement + ] + ++ (with pkgs.lomiri; [ + suru-icon-theme + lomiri-gallery-app + lomiri-thumbnailer # finds new images & generates thumbnails + ]); + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; + }; + + enableOCR = true; + + testScript = + '' + machine.wait_for_x() + + machine.succeed("mkdir /root/${builtins.dirOf file}") + machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}") + + with subtest("lomiri gallery finds files"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) + machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})") + + machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories + machine.sleep(2) + machine.succeed("xdotool mousemove 30 180 click 1") # photos + machine.sleep(2) + machine.screenshot("lomiri-gallery_photos") + + machine.succeed("xdotool mousemove 80 140 click 1") # select first one + machine.sleep(2) + machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar + machine.sleep(2) + + '' + + ( + if (customTest != null) then + customTest + else + '' + with subtest("lomiri gallery handles ${format}"): + machine.succeed("xdotool mousemove ${ + if buttonIsOffset then "900" else "940" + } 50 click 1") # open media information + machine.sleep(2) + machine.wait_for_text("${format}") # make sure we're looking at the right file + machine.screenshot("lomiri-gallery_${format}_info") + machine.send_key("esc") + machine.wait_for_text("${imageLabel}") # make sure media shows fine + '' + ); + + } + ); + makeFormatTests = + detailsList: + builtins.listToAttrs ( + builtins.map ( + { + name, + file, + buttonIsOffset ? null, + customTest ? null, + }: + { + name = "format-${name}"; + value = makeFormatTest { + inherit + file + buttonIsOffset + customTest + ; + }; + } + ) detailsList + ); in { - name = "lomiri-gallery-app-standalone"; - meta.maintainers = lib.teams.lomiri.members; - - nodes.machine = - { config, pkgs, ... }: + basic = makeTest ( + { lib, ... }: { - imports = [ ./common/x11.nix ]; + name = "lomiri-gallery-app-standalone-basic"; + meta.maintainers = lib.teams.lomiri.members; - services.xserver.enable = true; + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; - environment = { - etc."${imageDataDir}".source = - pkgs.runCommand imageDataDir - { - nativeBuildInputs = with pkgs; [ - ffmpeg # make a video from the image - (imagemagick.override { ghostscriptSupport = true; }) # add label for OCR - ]; - } - '' - mkdir -p $out/{Pictures,Videos} + services.xserver.enable = true; - # Setup example data, OCR-friendly: - # - White square, black text - # - Small text for display OCR - # - Big text for gallery preview OCR - # - uppercase extension - magick -size 500x500 -background white -fill black canvas:white \ - -pointsize 20 -annotate +100+100 '${imageLabel}' \ - -pointsize 70 -annotate +100+300 '${imageLabel}' \ - $out/Pictures/output.PNG + environment = { + systemPackages = + with pkgs; + [ + xdotool # mouse movement + ] + ++ (with pkgs.lomiri; [ + suru-icon-theme + lomiri-gallery-app + ]); + variables = { + UITK_ICON_THEME = "suru"; + }; + }; - # Different image formats - magick $out/Pictures/output.PNG $out/Pictures/output.JPG - magick $out/Pictures/output.PNG $out/Pictures/output.BMP - magick $out/Pictures/output.PNG $out/Pictures/output.GIF + i18n.supportedLocales = [ "all" ]; - # Video for dispatching - ffmpeg -loop 1 -r 1 -i $out/Pictures/output.PNG -t 100 -pix_fmt yuv420p $out/Videos/output.MP4 - ''; - systemPackages = - with pkgs; - [ - mpv # URI dispatching for video support - xdotool # mouse movement - ] - ++ (with pkgs.lomiri; [ - suru-icon-theme - lomiri-gallery-app - lomiri-thumbnailer # finds new images & generates thumbnails - ]); - variables = { - UITK_ICON_THEME = "suru"; + fonts = { + packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu-classic + ]; + }; }; - }; - i18n.supportedLocales = [ "all" ]; + enableOCR = true; - fonts = { - packages = with pkgs; [ - # Intended font & helps with OCR - ubuntu-classic - ]; - }; - }; + testScript = '' + machine.wait_for_x() - enableOCR = true; + with subtest("lomiri gallery launches"): + machine.succeed("lomiri-gallery-app >&2 &") + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) + machine.wait_for_text(r"(Albums|Events|Photos)") + machine.screenshot("lomiri-gallery_open") - testScript = - '' - machine.wait_for_x() + machine.succeed("pgrep -afx lomiri-gallery-app >&2") + machine.succeed("pkill -efx lomiri-gallery-app >&2") + machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2") - with subtest("lomiri gallery launches"): - machine.succeed("lomiri-gallery-app >&2 &") - machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded - machine.sleep(10) - machine.send_key("alt-f10") - machine.sleep(5) - machine.wait_for_text(r"(Albums|Events|Photos)") - machine.screenshot("lomiri-gallery_open") - machine.succeed("pgrep -afx lomiri-gallery-app >&2") - machine.succeed("pkill -efx lomiri-gallery-app >&2") - machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2") - - machine.succeed("cp -vr /etc/${imageDataDir}/* /root") - - with subtest("lomiri gallery finds files"): - machine.succeed("lomiri-gallery-app >&2 &") - machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded - machine.sleep(10) - machine.send_key("alt-f10") - machine.sleep(5) - machine.wait_for_text(r"(Albums|Events|Photos|${imageLabel})") - - machine.succeed("xdotool mousemove 30 40 click 1") # burger menu for categories - machine.sleep(2) - machine.succeed("xdotool mousemove 30 180 click 1") # photos - machine.sleep(2) - machine.wait_for_text("${imageLabel}") # should see thumbnail of at least one of them - machine.screenshot("lomiri-gallery_photos") - - machine.succeed("xdotool mousemove 80 140 click 1") # select newest one - machine.sleep(2) - machine.succeed("xdotool mousemove 80 140 click 1") # enable top-bar - machine.sleep(2) - - # MP4 gets special treatment + with subtest("lomiri gallery localisation works"): + machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &") + machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded + machine.sleep(10) + machine.send_key("alt-f10") + machine.sleep(5) + machine.wait_for_text(r"(Alben|Ereignisse|Fotos)") + machine.screenshot("lomiri-gallery_localised") + ''; + } + ); +} +// makeFormatTests [ + { + name = "mp4"; + file = "Videos/output.MP4"; + # MP4 gets special treatment + customTest = '' with subtest("lomiri gallery handles mp4"): machine.succeed("xdotool mousemove 935 40 click 1") # open media information machine.sleep(2) @@ -129,57 +252,26 @@ in machine.send_key("q") machine.wait_until_fails("pgrep mpv") # wait for video to stop - - machine.send_key("right") - '' - + - lib.concatMapStringsSep - '' - machine.send_key("right") - '' - (format: '' - with subtest("lomiri gallery handles ${format.ext}"): - machine.succeed("xdotool mousemove ${ - if format.buttonIsOffset then "900" else "940" - } 50 click 1") # open media information - machine.sleep(2) - machine.wait_for_text("${format.ext}") # make sure we're looking at the right file - machine.screenshot("lomiri-gallery_${format.ext}_info") - machine.send_key("esc") - machine.wait_for_text("${imageLabel}") # make sure media shows fine - '') - [ - { - ext = "GIF"; - buttonIsOffset = false; - } - { - ext = "BMP"; - buttonIsOffset = true; - } - { - ext = "JPG"; - buttonIsOffset = true; - } - { - ext = "PNG"; - buttonIsOffset = true; - } - ] - + '' - - machine.succeed("pgrep -afx lomiri-gallery-app >&2") - machine.succeed("pkill -efx lomiri-gallery-app >&2") - machine.wait_until_fails("pgrep -afx lomiri-gallery-app >&2") - - - with subtest("lomiri gallery localisation works"): - machine.succeed("env LANG=de_DE.UTF-8 lomiri-gallery-app >&2 &") - machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded - machine.sleep(10) - machine.send_key("alt-f10") - machine.sleep(5) - machine.wait_for_text(r"(Alben|Ereignisse|Fotos)") - machine.screenshot("lomiri-gallery_localised") ''; -} + } + { + name = "gif"; + file = "Pictures/output.GIF"; + buttonIsOffset = false; + } + { + name = "bmp"; + file = "Pictures/output.BMP"; + buttonIsOffset = true; + } + { + name = "jpg"; + file = "Pictures/output.JPG"; + buttonIsOffset = true; + } + { + name = "png"; + file = "Pictures/output.PNG"; + buttonIsOffset = true; + } +] diff --git a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix index 537bcaa302a8..2c8c6f1b6293 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix @@ -103,7 +103,16 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - tests.vm = nixosTests.lomiri-gallery-app; + tests = { + inherit (nixosTests.lomiri-gallery-app) + basic + format-mp4 + format-gif + format-bmp + format-jpg + format-png + ; + }; updateScript = gitUpdater { rev-prefix = "v"; }; }; diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 85e8c31df478..0ccb26ab7bad 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -188,7 +188,13 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests = { # gallery app delegates to thumbnailer, tests various formats - gallery-app = nixosTests.lomiri-gallery-app; + inherit (nixosTests.lomiri-gallery-app) + format-mp4 + format-gif + format-bmp + format-jpg + format-png + ; # music app relies on thumbnailer to extract embedded cover art music-app = nixosTests.lomiri-music-app; From 23274a2a2a121419d6d2ab9e7f50fb28bd724dac Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Tue, 27 May 2025 12:07:15 +0200 Subject: [PATCH 06/70] nixosTests.lomiri-gallery-app: Remove format extension check Test already makes sure that the to-be-tested format is the only one that gets installed, and OfBorg seems to get stuck on these sonmetimes. Just remove it. --- nixos/tests/lomiri-gallery-app.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index 104c6e51c03e..b4e9c0bcfd7e 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -127,9 +127,9 @@ let if buttonIsOffset then "900" else "940" } 50 click 1") # open media information machine.sleep(2) - machine.wait_for_text("${format}") # make sure we're looking at the right file machine.screenshot("lomiri-gallery_${format}_info") machine.send_key("esc") + machine.sleep(2) machine.wait_for_text("${imageLabel}") # make sure media shows fine '' ); @@ -238,9 +238,9 @@ in with subtest("lomiri gallery handles mp4"): machine.succeed("xdotool mousemove 935 40 click 1") # open media information machine.sleep(2) - machine.wait_for_text("MP4") # make sure we're looking at the right file machine.screenshot("lomiri-gallery_mp4_info") machine.send_key("esc") + machine.sleep(2) machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked From aff794fe22430fc8bbb436369b303602804794e4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 28 May 2025 22:47:06 +0200 Subject: [PATCH 07/70] nixosTests.lomiri-gallery-app: Cache media in thumbnailer ahead-of-time, retry until successful --- nixos/tests/lomiri-gallery-app.nix | 42 +++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/nixos/tests/lomiri-gallery-app.nix b/nixos/tests/lomiri-gallery-app.nix index b4e9c0bcfd7e..1f5638f39ba1 100644 --- a/nixos/tests/lomiri-gallery-app.nix +++ b/nixos/tests/lomiri-gallery-app.nix @@ -65,6 +65,7 @@ let systemPackages = with pkgs; [ + glib # Poke thumbnailer to process media via gdbus mpv # URI dispatching for video support xdotool # mouse movement ] @@ -78,7 +79,14 @@ let }; }; - i18n.supportedLocales = [ "all" ]; + # Allow us to start thumbnailer ahead-of-time, hopefully let thumbnails get processed in peace + systemd.user.services."dbus-com.lomiri.Thumbnailer" = { + serviceConfig = { + Type = "dbus"; + BusName = "com.lomiri.Thumbnailer"; + ExecStart = "${pkgs.lomiri.lomiri-thumbnailer}/libexec/lomiri-thumbnailer/thumbnailer-service"; + }; + }; fonts = { packages = with pkgs; [ @@ -97,6 +105,34 @@ let machine.succeed("mkdir /root/${builtins.dirOf file}") machine.succeed("cp -vr /etc/${imageDataDir}/${file} /root/${builtins.dirOf file}") + # Start thumbnailer, wait for idle shutdown + machine.systemctl("start dbus-com.lomiri.Thumbnailer", "root") + machine.wait_until_succeeds( + "env XDG_RUNTIME_DIR=/run/user/0 " + + "systemctl --user is-active dbus-com.lomiri.Thumbnailer" + ) + machine.wait_for_console_text("thumbnail cache:") + + # Request thumbnail processing, get initial thumbnail image into cache + # This can randomly take abit longer, just run it until it succeeds + # Touch file to invalidate failure cache + machine.wait_until_succeeds( + "touch '/root/${file}' && " + + "env XDG_RUNTIME_DIR=/run/user/0 " + + "gdbus call -e " + + "-d com.lomiri.Thumbnailer -o /com/lomiri/Thumbnailer " + + "-m com.lomiri.Thumbnailer.GetThumbnail " + + "'/root/${file}' " + # Same size as source, to reduce processing - we're very close to hitting 20s on slow hardware here + + "'@(ii) (500,500)'" + ) + + machine.wait_for_console_text("Idle timeout reached") + machine.wait_until_fails( + "env XDG_RUNTIME_DIR=/run/user/0 " + + "systemctl --user is-active dbus-com.lomiri.Thumbnailer" + ) + with subtest("lomiri gallery finds files"): machine.succeed("lomiri-gallery-app >&2 &") machine.wait_for_console_text("qq= AlbumsOverview") # logged when album page actually gets loaded @@ -243,15 +279,13 @@ in machine.sleep(2) machine.wait_for_text("${imageLabel}") # make sure thumbnail processing worked + machine.screenshot("lomiri-gallery_mp4_thumbnail") machine.succeed("xdotool mousemove 510 380 click 1") # dispatch to system's video handler machine.wait_until_succeeds("pgrep -u root -f mpv") # wait for video to start machine.sleep(10) machine.succeed("pgrep -u root -f mpv") # should still be playing machine.screenshot("lomiri-gallery_mp4_dispatch") - - machine.send_key("q") - machine.wait_until_fails("pgrep mpv") # wait for video to stop ''; } { From 1607bc4319d1e60ab9564118a7209963fbf8b408 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 30 May 2025 13:52:28 -0400 Subject: [PATCH 08/70] submit50: init at 3.2.0 Signed-off-by: Ethan Carter Edwards --- pkgs/by-name/su/submit50/package.nix | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/by-name/su/submit50/package.nix diff --git a/pkgs/by-name/su/submit50/package.nix b/pkgs/by-name/su/submit50/package.nix new file mode 100644 index 000000000000..652ab9e24f7b --- /dev/null +++ b/pkgs/by-name/su/submit50/package.nix @@ -0,0 +1,49 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + versionCheckHook, +}: + +python3Packages.buildPythonApplication rec { + pname = "submit50"; + version = "3.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "cs50"; + repo = "submit50"; + tag = "v${version}"; + hash = "sha256-i1hO9P3FGamo4b733/U7d2fiWLdnTskrHM2BXxxDePc="; + }; + + build-system = [ + python3Packages.setuptools + ]; + + dependencies = with python3Packages; [ + lib50 + packaging + pytz + requests + termcolor + ]; + + pythonImportsCheck = [ "submit50" ]; + + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + # no python tests + + meta = { + description = "Tool for submitting student CS50 code"; + homepage = "https://cs50.readthedocs.io/submit50/"; + downloadPage = "https://github.com/cs50/submit50"; + changelog = "https://github.com/cs50/submit50/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "submit50"; + }; +} From fe0bdbbfd31d86f4f2393df79ca11569b9ceed5e Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 1 Jun 2025 15:39:28 +0300 Subject: [PATCH 09/70] soundsource: 5.8.2 -> 5.8.3 --- pkgs/by-name/so/soundsource/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix index 108ef419e875..7bec0d15fd60 100644 --- a/pkgs/by-name/so/soundsource/package.nix +++ b/pkgs/by-name/so/soundsource/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "soundsource"; - version = "5.8.2"; + version = "5.8.3"; src = fetchurl { - url = "https://web.archive.org/web/20250424131232/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; - hash = "sha256-RilL2nD0pUQKCb63uip7q9kmsKVXvEPcT+GUfZKtKNM="; + url = "https://web.archive.org/web/20250601123927/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip"; + hash = "sha256-tomlsji65xVPTqX36UKf7S04M1iBxsXVJFEFqWPgBac="; }; dontUnpack = true; From 55bd133882a07ecbce9e563fb58f3a69b28dcf15 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 23:06:14 -0400 Subject: [PATCH 10/70] icewm: enable on darwin Signed-off-by: Ihar Hrachyshka XXX Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ic/icewm/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 78343cb0a49d..1e527d8663a6 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + gccStdenv, fetchFromGitHub, cmake, expat, @@ -39,7 +39,7 @@ pkg-config, }: -stdenv.mkDerivation (finalAttrs: { +gccStdenv.mkDerivation (finalAttrs: { pname = "icewm"; version = "3.7.5"; @@ -99,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { "-DCFGDIR=/etc/icewm" ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString gccStdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + # install legacy themes postInstall = '' cp -r ../lib/themes/{gtk2,Natural,nice,nice2,warp3,warp4,yellowmotif} \ @@ -123,6 +125,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = licenses.lgpl2Only; maintainers = [ ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }) From 5957890e5b1992299ae426f8596d7ee8ab0db5db Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 23:07:08 -0400 Subject: [PATCH 11/70] icewm: modernize Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/ic/icewm/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ic/icewm/package.nix b/pkgs/by-name/ic/icewm/package.nix index 1e527d8663a6..d5d0ed8eae36 100644 --- a/pkgs/by-name/ic/icewm/package.nix +++ b/pkgs/by-name/ic/icewm/package.nix @@ -107,7 +107,7 @@ gccStdenv.mkDerivation (finalAttrs: { $out/share/icewm/themes/ ''; - meta = with lib; { + meta = { homepage = "https://ice-wm.org/"; description = "Simple, lightweight X window manager"; longDescription = '' @@ -123,8 +123,8 @@ gccStdenv.mkDerivation (finalAttrs: { optional external background wallpaper manager with transparency support, a simple session manager and a system tray. ''; - license = licenses.lgpl2Only; + license = lib.licenses.lgpl2Only; maintainers = [ ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; }) From 343001d755ece557ad428a323c8e61a086352862 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Jun 2025 05:55:32 +0000 Subject: [PATCH 12/70] sonarlint-ls: 3.22.0.76129 -> 3.23.0.76182 --- pkgs/by-name/so/sonarlint-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index a49568aa66bd..a7e6266875fe 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -16,17 +16,17 @@ maven.buildMavenPackage rec { pname = "sonarlint-ls"; - version = "3.22.0.76129"; + version = "3.23.0.76182"; src = fetchFromGitHub { owner = "SonarSource"; repo = "sonarlint-language-server"; rev = version; - hash = "sha256-W0X22akE8hDQcuJLq4BXsAKebMb/jDvoG1i3jkA7QaM="; + hash = "sha256-kN2AR3SP/SZnD7uEDaQkzg9l4lNvBNtX7Q2HV9/fk+0="; }; mvnJdk = jdk17; - mvnHash = "sha256-7EXa/A5E8/spd4QrBMSgKyKpnA561NstpjCHbC1EBu4="; + mvnHash = "sha256-mQc13HVgDK5V08BGB79RMVfMwlagPXGRIB72JfnQRes="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ From b08ea14f5ed40aff6e4e18628db186595387a7b5 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 21:38:24 -0400 Subject: [PATCH 13/70] xarchiver: enable on darwin Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/xa/xarchiver/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xa/xarchiver/package.nix b/pkgs/by-name/xa/xarchiver/package.nix index a2cf7b39fa38..dc6be6f6d251 100644 --- a/pkgs/by-name/xa/xarchiver/package.nix +++ b/pkgs/by-name/xa/xarchiver/package.nix @@ -17,6 +17,7 @@ gzip, lhasa, wrapGAppsHook3, + desktopToDarwinBundle, }: stdenv.mkDerivation rec { @@ -35,7 +36,8 @@ stdenv.mkDerivation rec { pkg-config makeWrapper wrapGAppsHook3 - ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ gtk3 libxslt @@ -59,7 +61,6 @@ stdenv.mkDerivation rec { ''; meta = { - broken = stdenv.hostPlatform.isDarwin; description = "GTK frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; homepage = "https://github.com/ib/xarchiver"; maintainers = [ lib.maintainers.domenkozar ]; From cd6c4b470fec50f233d0d8182d5d9453d0d12e3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 4 Jun 2025 08:25:41 +0200 Subject: [PATCH 14/70] python313Packages.bleak-esphome: 2.15.1 -> 2.16.0 Diff: https://github.com/bluetooth-devices/bleak-esphome/compare/refs/tags/v2.15.1...refs/tags/v2.16.0 Changelog: https://github.com/bluetooth-devices/bleak-esphome/blob/v2.16.0/CHANGELOG.md --- pkgs/development/python-modules/bleak-esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 13a95473f2e2..c9ed350d62d6 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "2.15.1"; + version = "2.16.0"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${version}"; - hash = "sha256-Q+W7i0+Qsm1wfVNC+ub9J9DOcP7D4gZkjw3j37aHhYc="; + hash = "sha256-1NqalsFUXTcVX0UVV4BMStX+EAcu0/3vEKpkq+z+KDE="; }; postPatch = '' From 68d647919333b5efd2cbe14199ee8f71bc63c312 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 10 May 2025 23:38:25 +0000 Subject: [PATCH 15/70] =?UTF-8?q?python3Packages.temporalio:=201.11.0=20?= =?UTF-8?q?=E2=86=92=201.12.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/temporalio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix index 110d9a68b333..9e5ea1607fd5 100644 --- a/pkgs/development/python-modules/temporalio/default.nix +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "temporalio"; - version = "1.11.0"; + version = "1.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "temporalio"; repo = "sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-942EmFOAYUWq58MW2rIVhDK9dHkzi62fUdOudYP94hU="; + hash = "sha256-u74zbzYNVxMi0sdiPlBoEU+wAa24JmMksz7hGvraDeM="; fetchSubmodules = true; }; @@ -39,7 +39,7 @@ buildPythonPackage rec { src cargoRoot ; - hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM="; + hash = "sha256-OIapL1+g6gIgyVzdB68PuK2K2RIr01DSm/UbCdt9kNY="; }; cargoRoot = "temporalio/bridge"; From 9c48df34df542f44938b0c00a0e517e6c1beb49a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Jun 2025 15:36:02 +0000 Subject: [PATCH 16/70] python3Packages.llama-cloud-services: 0.6.23 -> 0.6.28 --- .../python-modules/llama-cloud-services/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix index d6f8eb464e93..a890548e1c38 100644 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ b/pkgs/development/python-modules/llama-cloud-services/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "llama-cloud-services"; - version = "0.6.23"; + version = "0.6.28"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_cloud_services"; tag = "v${version}"; - hash = "sha256-G1qjm7GpSZDgGWys+toXiQoRJHIQUcwG6+0JK8k3XfE="; + hash = "sha256-2ANsXUOTTWhIS6/BPvlOox4KJcQI0lngPMAf3Hous7s="; }; pythonRelaxDeps = [ "llama-cloud" ]; From f217bb1f0288e1004d6e937bd20a8750da85e742 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 5 Jun 2025 17:27:40 +0000 Subject: [PATCH 17/70] noto-fonts: 2025.05.01 -> 2025.06.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 0c9d6ddef625..3304e57b49e5 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation rec { pname = "noto-fonts${suffix}"; - version = "2025.05.01"; + version = "2025.06.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-voOizeGK7fU2bGLoNBhdNIfleDCu84nFiEHo5lCIye4="; + hash = "sha256-6lbNJjkf6lnPPZzHO3vtsXEuPQs6ewslgnQIeDhF2yk="; }; outputs = [ From ee862a54b7ad53c1a0b797c4e01f9b933c228919 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:03:56 +0800 Subject: [PATCH 18/70] kaidan: move to by-name --- .../ka/kaidan/package.nix} | 50 +++++++------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 19 insertions(+), 33 deletions(-) rename pkgs/{applications/networking/instant-messengers/kaidan/default.nix => by-name/ka/kaidan/package.nix} (71%) diff --git a/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/pkgs/by-name/ka/kaidan/package.nix similarity index 71% rename from pkgs/applications/networking/instant-messengers/kaidan/default.nix rename to pkgs/by-name/ka/kaidan/package.nix index 319ab8a94626..7c911ff81376 100644 --- a/pkgs/applications/networking/instant-messengers/kaidan/default.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -5,22 +5,10 @@ cmake, extra-cmake-modules, pkg-config, - wrapQtAppsHook, - qtbase, - qttools, - qtmultimedia, - qtlocation, - qqc2-desktop-style, - kirigami-addons, - kirigami, - kio, - knotifications, - kquickimageedit, + kdePackages, zxing-cpp, qxmpp, - sonnet, gst_all_1, - prison, }: stdenv.mkDerivation rec { @@ -39,28 +27,28 @@ stdenv.mkDerivation rec { cmake extra-cmake-modules pkg-config - wrapQtAppsHook + kdePackages.wrapQtAppsHook ]; - buildInputs = with gst_all_1; [ - qtbase - qttools - qtmultimedia - qtlocation - qqc2-desktop-style - kirigami-addons - kirigami - kio - knotifications - kquickimageedit + buildInputs = [ + kdePackages.kio + kdePackages.kirigami + kdePackages.kirigami-addons + kdePackages.knotifications + kdePackages.kquickimageedit + kdePackages.prison + kdePackages.qtbase + kdePackages.qttools + kdePackages.qtmultimedia + kdePackages.qtlocation + kdePackages.qqc2-desktop-style + kdePackages.sonnet zxing-cpp qxmpp - sonnet - gstreamer - gst-plugins-bad - gst-plugins-base - (gst-plugins-good.override { qt6Support = true; }) - prison + gst_all_1.gstreamer + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-base + (gst_all_1.gst-plugins-good.override { qt6Support = true; }) ]; postInstall = '' qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 339dc8a399fe..f6a129323524 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12979,8 +12979,6 @@ with pkgs; kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { }; - kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; kgraphviewer = callPackage ../applications/graphics/kgraphviewer { }; From 1001a577e6c7cfac57a8cbbb4268d1ad0f8a58d1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:14:35 +0800 Subject: [PATCH 19/70] kaidan: use finalAttrs --- pkgs/by-name/ka/kaidan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index 7c911ff81376..f974266a6e23 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -11,15 +11,15 @@ gst_all_1, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "kaidan"; version = "0.11.0"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "network"; - repo = pname; - rev = "v${version}"; + repo = "kaidan"; + rev = "v${finalAttrs.version}"; hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y="; }; @@ -76,4 +76,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ astro ]; platforms = with platforms; linux; }; -} +}) From 209dc6172e041ffd434b08fc8d2be8c3eab00392 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Fri, 6 Jun 2025 15:15:37 +0800 Subject: [PATCH 20/70] kaidan: avoid with lib; --- pkgs/by-name/ka/kaidan/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ka/kaidan/package.nix b/pkgs/by-name/ka/kaidan/package.nix index f974266a6e23..825533dd245c 100644 --- a/pkgs/by-name/ka/kaidan/package.nix +++ b/pkgs/by-name/ka/kaidan/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; - meta = with lib; { + meta = { description = "User-friendly and modern chat app, using XMPP"; mainProgram = "kaidan"; longDescription = '' @@ -67,13 +67,13 @@ stdenv.mkDerivation (finalAttrs: { messages, and file sharing. ''; homepage = "https://www.kaidan.im"; - license = with licenses; [ + license = with lib.licenses; [ gpl3Plus mit asl20 cc-by-sa-40 ]; - maintainers = with maintainers; [ astro ]; - platforms = with platforms; linux; + maintainers = with lib.maintainers; [ astro ]; + platforms = with lib.platforms; linux; }; }) From 319feec0a2c71f9bba3aa7e1cd53c99cdacd3a53 Mon Sep 17 00:00:00 2001 From: Jakob Leifhelm Date: Sat, 10 Aug 2024 12:56:37 +0200 Subject: [PATCH 21/70] ubootVisionFive2: init --- pkgs/misc/uboot/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 22 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index ba433461bd19..13320be7065b 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -27,6 +27,7 @@ armTrustedFirmwareRK3568, armTrustedFirmwareRK3588, armTrustedFirmwareS905, + opensbi, buildPackages, }@pkgs: @@ -808,6 +809,26 @@ in # sf probe; sf update $loadaddr 0 80000 }; + ubootVisionFive2 = + let + opensbi_vf2 = opensbi.overrideAttrs (attrs: { + makeFlags = attrs.makeFlags ++ [ + # Matches u-boot documentation: https://docs.u-boot.org/en/latest/board/starfive/visionfive2.html + "FW_TEXT_START=0x40000000" + "FW_OPTIONS=0" + ]; + }); + in + buildUBoot { + defconfig = "starfive_visionfive2_defconfig"; + extraMeta.platforms = [ "riscv64-linux" ]; + OPENSBI = "${opensbi_vf2}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin"; + filesToInstall = [ + "spl/u-boot-spl.bin.normal.out" + "u-boot.itb" + ]; + }; + ubootWandboard = buildUBoot { defconfig = "wandboard_defconfig"; extraMeta.platforms = [ "armv7l-linux" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09c32d2f97c2..7e2916fc55b2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11552,6 +11552,7 @@ with pkgs; ubootSopine ubootTuringRK1 ubootUtilite + ubootVisionFive2 ubootWandboard ; From 1dbcbd1b1598a34c00c70fd3d7e04ac94ef60f78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 18:17:57 +0000 Subject: [PATCH 22/70] renovate: 40.33.1 -> 40.48.0 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 6adc21902578..b9fff9999b90 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "40.33.1"; + version = "40.48.0"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-W2FoiU48rJr6o7HQW9MFNr92sag4QUGaRLbtMeM5418="; + hash = "sha256-SZKa1jIK5FIh8t/aH2o3kgSfqgNR9+rk7GzMX0Fs2dk="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_10.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-NEqgX3OHy9kbIhdaHiR7C7wGHZKe35it5G7kOro5RPQ="; + hash = "sha256-BjMJzITAeUspL0a/ZfhejmOdEVi6pBHD6BmQt2WIE1I="; }; env.COREPACK_ENABLE_STRICT = 0; From 69cc10fe0c1cc1396b5260f3612a345069729ce7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 19:07:20 +0000 Subject: [PATCH 23/70] python3Packages.python-bsblan: 1.2.2 -> 2.1.0 --- pkgs/development/python-modules/python-bsblan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix index 53967ac7a55d..a69e49c94890 100644 --- a/pkgs/development/python-modules/python-bsblan/default.nix +++ b/pkgs/development/python-modules/python-bsblan/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-bsblan"; - version = "1.2.2"; + version = "2.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "liudger"; repo = "python-bsblan"; tag = "v${version}"; - hash = "sha256-qzQP77bfV21g7DIdZfJCyv9FN/U6aQk9wWV9xPZFolk="; + hash = "sha256-HaB1ypC2IkSEnM5Ek583CFvwWt1nm1gWUdoh5MH09YQ="; }; postPatch = '' @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control and monitor an BSBLan device programmatically"; homepage = "https://github.com/liudger/python-bsblan"; - changelog = "https://github.com/liudger/python-bsblan/releases/tag/v${version}"; + changelog = "https://github.com/liudger/python-bsblan/releases/tag/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From aec172c0dffbffdd741aee0fe64f0aa87b7cf7ef Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 8 Jun 2025 13:21:23 +0800 Subject: [PATCH 24/70] dqlite: use finalAttrs --- pkgs/by-name/dq/dqlite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix index 0405502e9ac1..7c8a9226671e 100644 --- a/pkgs/by-name/dq/dqlite/package.nix +++ b/pkgs/by-name/dq/dqlite/package.nix @@ -11,14 +11,14 @@ lxd-lts, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dqlite"; version = "1.18.1"; src = fetchFromGitHub { owner = "canonical"; repo = "dqlite"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7ou077ozbpH21PcvEEcprr4UYJ/X398Ph9dh5C3YyBQ="; }; @@ -57,4 +57,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.linux; }; -} +}) From 7836a555c3d09fac5247b78bad1356627909b812 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 8 Jun 2025 13:22:17 +0800 Subject: [PATCH 25/70] dqlite: avoid with lib; --- pkgs/by-name/dq/dqlite/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dq/dqlite/package.nix b/pkgs/by-name/dq/dqlite/package.nix index 7c8a9226671e..3a4040d2c9a3 100644 --- a/pkgs/by-name/dq/dqlite/package.nix +++ b/pkgs/by-name/dq/dqlite/package.nix @@ -47,14 +47,14 @@ stdenv.mkDerivation (finalAttrs: { inherit lxd-lts; }; - meta = with lib; { + meta = { description = '' Expose a SQLite database over the network and replicate it across a cluster of peers ''; homepage = "https://dqlite.io/"; - license = licenses.asl20; + license = lib.licenses.asl20; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; }) From 5c695bad7863dfa391de5b72c77ced715913e456 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 07:15:22 +0000 Subject: [PATCH 26/70] pyfa: 2.63.0 -> 2.63.1 --- pkgs/by-name/py/pyfa/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyfa/package.nix b/pkgs/by-name/py/pyfa/package.nix index b9ed915f53b3..196231ffb451 100644 --- a/pkgs/by-name/py/pyfa/package.nix +++ b/pkgs/by-name/py/pyfa/package.nix @@ -10,7 +10,7 @@ copyDesktopItems, }: let - version = "2.63.0"; + version = "2.63.1"; in python3Packages.buildPythonApplication rec { inherit version; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { owner = "pyfa-org"; repo = "Pyfa"; tag = "v${version}"; - hash = "sha256-2GLfI3NvhxsnxlApjRM+X+QoqkB8GE1WOgGibvK1k7M="; + hash = "sha256-kpTJ7cgS/W0mUtplERiEYJA+FszPILCI+0AVbk6MVAA="; }; desktopItems = [ From 8cf5bf456120711bbd21d298f6beb2efd1748b1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jun 2025 14:06:25 +0200 Subject: [PATCH 27/70] prowler: 5.7.2 -> 5.7.3 Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/5.7.2...refs/tags/5.7.3 Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.7.3 --- pkgs/by-name/pr/prowler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 22f67824b1e3..c9620cb85793 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -21,14 +21,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.7.2"; + version = "5.7.3"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-yVUZsH/hLl/VCbLdaMujIl6NT6FzgkPfhpcOrQMcHGk="; + hash = "sha256-b7tgSvX9o6lJZp5uKXBCn8g+RowgsTDDRYaJ8UmGX74="; }; pythonRelaxDeps = true; From 7d41b4d86fea29605448f20421e57bb807909fb6 Mon Sep 17 00:00:00 2001 From: Conroy Cheers Date: Fri, 6 Jun 2025 10:52:23 +1000 Subject: [PATCH 28/70] python312Packages.bitsandbytes: 0.45.1 -> 0.46.0 --- .../python-modules/bitsandbytes/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix index 49bc8150d6e4..14299f664c4b 100644 --- a/pkgs/development/python-modules/bitsandbytes/default.nix +++ b/pkgs/development/python-modules/bitsandbytes/default.nix @@ -11,7 +11,7 @@ let pname = "bitsandbytes"; - version = "0.45.1"; + version = "0.46.0"; inherit (torch) cudaPackages cudaSupport; inherit (cudaPackages) cudaMajorMinorVersion; @@ -54,10 +54,10 @@ buildPythonPackage { pyproject = true; src = fetchFromGitHub { - owner = "TimDettmers"; + owner = "bitsandbytes-foundation"; repo = "bitsandbytes"; tag = version; - hash = "sha256-MZ+3mUXaAhRb+rBtE+eQqT3XdtFxlWJc/CmTEwQkKSA="; + hash = "sha256-q1ltNYO5Ex6F2bfCcsekdsWjzXoal7g4n/LIHVGuj+k="; }; # By default, which library is loaded depends on the result of `torch.cuda.is_available()`. @@ -112,8 +112,8 @@ buildPythonPackage { meta = { description = "8-bit CUDA functions for PyTorch"; - homepage = "https://github.com/TimDettmers/bitsandbytes"; - changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}"; + homepage = "https://github.com/bitsandbytes-foundation/bitsandbytes"; + changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; }; From c15b6b98c8e2e801cc3afac6a308a52996ed9d9c Mon Sep 17 00:00:00 2001 From: emaryn Date: Sun, 8 Jun 2025 20:51:35 +0800 Subject: [PATCH 29/70] python313Packages.woob: 3.6 -> 3.7 Diff: https://gitlab.com/woob/woob/-/compare/3.6...3.7 Changelog: https://gitlab.com/woob/woob/-/blob/3.7/ChangeLog --- .../python-modules/woob/default.nix | 39 ++++++++----------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index cf03a672a078..db4a5da315a5 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -1,9 +1,8 @@ { lib, - babel, buildPythonPackage, fetchFromGitLab, - fetchpatch, + babel, html2text, lxml, packaging, @@ -20,41 +19,33 @@ setuptools, testers, unidecode, + termcolor, + responses, woob, }: buildPythonPackage rec { pname = "woob"; - version = "3.6"; + version = "3.7"; pyproject = true; - disabled = pythonOlder "3.7"; src = fetchFromGitLab { owner = "woob"; repo = "woob"; - rev = version; - hash = "sha256-M9AjV954H1w64YGCVxDEGGSnoEbmocG3zwltob6IW04="; + tag = version; + hash = "sha256-EZHzw+/BIIvmDXG4fF367wsdUTVTHWYb0d0U56ZXwOs="; }; - patches = [ - (fetchpatch { - name = "no-deprecated-pkg_resources.patch"; - url = "https://gitlab.com/woob/woob/-/commit/3283c4c1a935cc71acea98b2d8c88bc4bf28f643.patch"; - hash = "sha256-3bRuv93ivKRxbGr52coO023DlxHZWwUeInXTPqQAeL8="; - }) - ]; - - nativeBuildInputs = [ - setuptools - ]; + build-system = [ setuptools ]; pythonRelaxDeps = [ "packaging" "rich" + "requests" ]; - propagatedBuildInputs = [ + dependencies = [ babel python-dateutil python-jose @@ -68,9 +59,13 @@ buildPythonPackage rec { requests rich unidecode + termcolor ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + responses + ]; disabledTests = [ # require networking @@ -85,12 +80,12 @@ buildPythonPackage rec { version = "v${version}"; }; - meta = with lib; { + meta = { changelog = "https://gitlab.com/woob/woob/-/blob/${src.rev}/ChangeLog"; description = "Collection of applications and APIs to interact with websites"; mainProgram = "woob"; homepage = "https://woob.tech"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ DamienCassou ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ DamienCassou ]; }; } From e38a23bc1455128993ba3685fd0cfc02f129a87a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 Jun 2025 15:10:43 +0200 Subject: [PATCH 30/70] jwt-hack: 1.2.0 -> 2.0.0 Changelog: https://github.com/hahwul/jwt-hack/releases/tag/v2.0.0 --- pkgs/by-name/jw/jwt-hack/Cargo.lock | 1299 ++++++++++++++++++++++++++ pkgs/by-name/jw/jwt-hack/package.nix | 23 +- 2 files changed, 1311 insertions(+), 11 deletions(-) create mode 100644 pkgs/by-name/jw/jwt-hack/Cargo.lock diff --git a/pkgs/by-name/jw/jwt-hack/Cargo.lock b/pkgs/by-name/jw/jwt-hack/Cargo.lock new file mode 100644 index 000000000000..24b8a68325b6 --- /dev/null +++ b/pkgs/by-name/jw/jwt-hack/Cargo.lock @@ -0,0 +1,1299 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" + +[[package]] +name = "anstyle-parse" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.59.0", +] + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "backtrace" +version = "0.3.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets", +] + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "bumpalo" +version = "3.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + +[[package]] +name = "cc" +version = "1.2.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac" +dependencies = [ + "shlex", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-link", +] + +[[package]] +name = "clap" +version = "4.5.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.39" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" + +[[package]] +name = "colorchoice" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" + +[[package]] +name = "colored" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" +dependencies = [ + "lazy_static", + "windows-sys 0.59.0", +] + +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width", + "windows-sys 0.59.0", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" + +[[package]] +name = "crossbeam-deque" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "deranged" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "errno" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + +[[package]] +name = "getrandom" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "wasi 0.14.2+wasi-0.2.4", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08" + +[[package]] +name = "hmac-sha256" +version = "1.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad6880c8d4a9ebf39c6e8b77007ce223f646a4d21ce29d99f70cb16420545425" + +[[package]] +name = "humantime" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f" + +[[package]] +name = "iana-time-zone" +version = "0.1.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "indicatif" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width", + "web-time", +] + +[[package]] +name = "is-terminal" +version = "0.4.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + +[[package]] +name = "js-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + +[[package]] +name = "jsonwebtoken" +version = "8.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" +dependencies = [ + "base64 0.21.7", + "pem", + "ring", + "serde", + "serde_json", + "simple_asn1", +] + +[[package]] +name = "jwt-hack" +version = "2.0.0" +dependencies = [ + "anyhow", + "base64 0.21.7", + "chrono", + "clap", + "colored", + "env_logger", + "hmac-sha256", + "indicatif", + "jsonwebtoken", + "log", + "rayon", + "serde", + "serde_json", + "tempfile", + "thiserror 1.0.69", + "tokio", +] + +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + +[[package]] +name = "libc" +version = "0.2.172" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "linux-raw-sys" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + +[[package]] +name = "miniz_oxide" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys 0.59.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +dependencies = [ + "autocfg", +] + +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad" + +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + +[[package]] +name = "pem" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +dependencies = [ + "base64 0.13.1", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "portable-atomic" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "proc-macro2" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + +[[package]] +name = "ring" +version = "0.16.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +dependencies = [ + "cc", + "libc", + "once_cell", + "spin", + "untrusted", + "web-sys", + "winapi", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" + +[[package]] +name = "rustix" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266" +dependencies = [ + "bitflags", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.59.0", +] + +[[package]] +name = "rustversion" +version = "1.0.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410" +dependencies = [ + "libc", +] + +[[package]] +name = "simple_asn1" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb" +dependencies = [ + "num-bigint", + "num-traits", + "thiserror 2.0.12", + "time", +] + +[[package]] +name = "smallvec" +version = "1.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" + +[[package]] +name = "socket2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "syn" +version = "2.0.101" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +dependencies = [ + "fastrand", + "getrandom", + "once_cell", + "rustix", + "windows-sys 0.59.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "time" +version = "0.3.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40" +dependencies = [ + "deranged", + "itoa", + "num-conv", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c" + +[[package]] +name = "time-macros" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tokio" +version = "1.45.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.52.0", +] + +[[package]] +name = "tokio-macros" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasi" +version = "0.14.2+wasi-0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" +dependencies = [ + "bumpalo", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "web-sys" +version = "0.3.77" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] diff --git a/pkgs/by-name/jw/jwt-hack/package.nix b/pkgs/by-name/jw/jwt-hack/package.nix index 19f6c347292b..6267d5cc0a0e 100644 --- a/pkgs/by-name/jw/jwt-hack/package.nix +++ b/pkgs/by-name/jw/jwt-hack/package.nix @@ -1,31 +1,32 @@ { lib, - buildGoModule, + rustPlatform, fetchFromGitHub, }: -buildGoModule rec { +rustPlatform.buildRustPackage rec { pname = "jwt-hack"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "hahwul"; repo = "jwt-hack"; tag = "v${version}"; - hash = "sha256-IHR+ItI4ToINLpkVc7yrgpNTS17nD02G6x3pNMEfIW4="; + hash = "sha256-uJur/ABoAaQT3BBO2yprK/0/bQPT138Yg9IbztZ6w2w="; }; - vendorHash = "sha256-YEH+epSvyy1j0s8AIJ5+BdF47H7KqgBRC4t81noOkjo="; + cargoLock = { + lockFile = ./Cargo.lock; + }; - ldflags = [ - "-w" - "-s" - ]; + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; meta = { - description = "Tool for attacking JWT"; + description = "JSON Web Token Hack Toolkit"; homepage = "https://github.com/hahwul/jwt-hack"; - changelog = "https://github.com/hahwul/jwt-hack/releases/tag/v${version}"; + changelog = "https://github.com/hahwul/jwt-hack/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "jwt-hack"; From d005dbaae9775493ab1b0f0bd9b6be70a76bfeb5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 15:19:22 +0000 Subject: [PATCH 31/70] nzbhydra2: 7.13.2 -> 7.14.1 --- pkgs/by-name/nz/nzbhydra2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 4c38a3ef3810..32cffd4c25da 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.13.2"; + version = "7.14.1"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-l2BBbNW6Yy6oFXYNhqKNscBg7x/vNJNh7LD+AbXDdd4="; + hash = "sha256-bHpL25GTTvLCZraRm4Yw7MsuV/yAUnwZo9rkGrWp1C0="; stripRoot = false; }; From 35cbcbb8e834da2274a96aace58e95dcb2d242c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 16:54:31 +0000 Subject: [PATCH 32/70] quark-engine: 25.5.1 -> 25.6.1 --- pkgs/by-name/qu/quark-engine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix index 30400d74c801..82488e27ccc5 100644 --- a/pkgs/by-name/qu/quark-engine/package.nix +++ b/pkgs/by-name/qu/quark-engine/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "25.5.1"; + version = "25.6.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; tag = "v${version}"; - hash = "sha256-gu9W8+LyJHEqvn7Mrvjn7XjDjObAh8zRchNbTNWkT1M="; + hash = "sha256-DAD37fzswY3c0d+ubOCYImxs4qyD4fhC3m2l0iD977A="; }; build-system = with python3.pkgs; [ setuptools ]; From e64838938a6f8cc0620ef6c25161d3fb9c2b1fe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 17:32:01 +0000 Subject: [PATCH 33/70] geoserver: 2.27.0 -> 2.27.1 --- pkgs/by-name/ge/geoserver/extensions.nix | 202 +++++++++++------------ pkgs/by-name/ge/geoserver/package.nix | 4 +- 2 files changed, 103 insertions(+), 103 deletions(-) diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 067380923801..267dc9e0314f 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -42,325 +42,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.27.0"; # app-schema - hash = "sha256-S7WtIbmn9RF0mmTRiOH5zFsjZ6y0mvVu0H8jKCdTPHM="; # app-schema + version = "2.27.1"; # app-schema + hash = "sha256-en9j/FhM7llsgvg26nIqqpt3wVJ9wtshkimMQ4bn1O4="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.27.0"; # authkey - hash = "sha256-GwA/f5wMf701TEs04Dgx/zcEA/jBHgw0JuJMKqTuRTU="; # authkey + version = "2.27.1"; # authkey + hash = "sha256-c2m5qfeeAlRoKl1ZgGzlURYivgUMh/22MBNXscKiRi8="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.27.0"; # cas - hash = "sha256-poD8OBeR7txtM1nJDy5MV6GVREVonLvx3TUY3a1V2Mc="; # cas + version = "2.27.1"; # cas + hash = "sha256-42ePZ90vATFsTkT9e2XaKM2uR05K5xUYbmwFPyQR4xk="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.27.0"; # charts - hash = "sha256-8FoaN9EoFZ56YPev//IphMjce1iJQnMbP6xCdVSwMiU="; # charts + version = "2.27.1"; # charts + hash = "sha256-y2N7/ZnxeiP0cNtLXMzN0jSIAGc8t1QzSLD1wEVa/LY="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.27.0"; # control-flow - hash = "sha256-DyZp/dcRm/xuvxv49qvepcDJPyHGiG4wMbEzKNhNcH0="; # control-flow + version = "2.27.1"; # control-flow + hash = "sha256-/Vv2otkJuaPAHxs7bZZ4UkB5tXR7YLb2Qn0eA5wRJkk="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.27.0"; # css - hash = "sha256-PKRgGbDlTjrFkhrDpbjDjAl+Q/gjWXFw9C0QpKB8+Ro="; # css + version = "2.27.1"; # css + hash = "sha256-ZQtyljZuQdX7fS+4oGALXZBsscr8M6m1hgAN0EoBRVM="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.27.0"; # csw - hash = "sha256-sddOghBd8OVjKmaF3PqM/G+RkpsUk6vmCZv7uQJTJnU="; # csw + version = "2.27.1"; # csw + hash = "sha256-P0PMs8JNxHXwPy610mYc9Fz6uO+LnYWm7fd8i2R3vTY="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.27.0"; # csw-iso - hash = "sha256-WVKVoQWIusgpAZUWPybBBIMbtWB56uNix3T50hy0x5w="; # csw-iso + version = "2.27.1"; # csw-iso + hash = "sha256-aQCFUTQeTx+RuBjXksq3guHQ+LIaA3RCSLv9XQ9BdtA="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.27.0"; # db2 - hash = "sha256-jlyRGOGBFJ0+sArKXqchITlS6swE/v4ScdxPKWANFaE="; # db2 + version = "2.27.1"; # db2 + hash = "sha256-RO1IH1AZ3iiEHzx95ZC9+aqD7pB7lMQ0MQ8uHjfQLR4="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.27.0"; # dxf - hash = "sha256-hdn5X7T5/H7Ti0UK3MdG0TFGInwu7S7Z4VghcWx+hdQ="; # dxf + version = "2.27.1"; # dxf + hash = "sha256-DxQWW59+FslrmX601CffZabF+uZA+ujHVGmbwatQT9M="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.27.0"; # excel - hash = "sha256-EH1TZeYPk+sb9+7ZfjbaEsNgQJ+/57XCc2+CvELsY88="; # excel + version = "2.27.1"; # excel + hash = "sha256-G6KBuBVxW879GffpKJVJgK2sO65S+zfUsKomXPBUejA="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.27.0"; # feature-pregeneralized - hash = "sha256-0389xo0NjTREGQLMrqJesl/XrFOrjFjjFBL7GSUMl/Y="; # feature-pregeneralized + version = "2.27.1"; # feature-pregeneralized + hash = "sha256-wbUZAWTSFDutmGUhkFI0Hl/WbZRb5sLet2FdZmxLeLM="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.27.0"; # gdal + version = "2.27.1"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-oTSEk+AmgXydSF4TZD9m5ViyeWh5HpAprMZAPMdP2LI="; # gdal + hash = "sha256-xw6DoOxImOLnmPxYMkaH4bKes0vVobzvT1IiDywq828="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.27.0"; # geofence - # hash = "sha256-P7ZHvC4qv1meziqPmBfOgQ+Y06Ico0N1trUi9LMZUJQ="; # geofence + # version = "2.27.1"; # geofence + # hash = "sha256-ccbCBCrb4zbZQ2eCDZo/FOT2IiUhruV62h7SrITdPdw="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.27.0"; # geofence-server + # version = "2.27.1"; # geofence-server # hash = ""; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.27.0"; # geofence-wps - # hash = "sha256-8Wvb/elunsYTFD1GgEQunM8i0eDyOA/W52KZ9+7uvvk="; # geofence-wps + # version = "2.27.1"; # geofence-wps + # hash = "sha256-k2z+xBUZw7cz/sPRjAEsKey6oqY1FzpaMGJcCm73kdg="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.27.0"; # geopkg-output - hash = "sha256-VUqBTt0XfSY2Q8cfeCpVmr398PK+Sb74APSrBODJNlw="; # geopkg-output + version = "2.27.1"; # geopkg-output + hash = "sha256-wECoUeBJLh00hJHT/adz7YF8AraPl1rOd9GLL1BP5dU="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.27.0"; # grib - hash = "sha256-xX9LAgo5exeD2UxZ8/LROZWobLHLw33jcpwERGUGPys="; # grib + version = "2.27.1"; # grib + hash = "sha256-gu8sDIA46u0Uj9+lJJ65mn3FD6D+DjsTN8KbNUeoOP0="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.27.0"; # gwc-s3 - hash = "sha256-/koF00Rki1xiY/g4ahhvFZNQxGnvIbbnqNmYHBqArBI="; # gwc-s3 + version = "2.27.1"; # gwc-s3 + hash = "sha256-UBy17pwwjDJFBIgUyQSThj3Kn1bber/pglsUr/h4d+Q="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.27.0"; # h2 - hash = "sha256-lfWu3812AMv0bB2dllNlcOSyN+IMASI/nkjLaStvUtw="; # h2 + version = "2.27.1"; # h2 + hash = "sha256-cXtc5OBAn3ppoGns6MvivgCYW841LJt1SPi5nNDE2O8="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.27.0"; # iau - hash = "sha256-9PhWejZILq1hcWBdvWh9SdtfLOlpFcaIU9TeJ8z7UUw="; # iau + version = "2.27.1"; # iau + hash = "sha256-77ULte2jCRN+gfd9/tOL26RX7EjKK6h5JaqQBR8TSI8="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.27.0"; # importer - hash = "sha256-oqlNcUkO7XlcI6QQF+44kt69ZWtPSdcpyuA5xGtVrAQ="; # importer + version = "2.27.1"; # importer + hash = "sha256-qrwMz7R/m/BtwNUcJV+mJu8pTNS+00EjWq/hMnF3/T0="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.27.0"; # inspire - hash = "sha256-irSJm3gDJAiDHczkS84OW+noOIryCOmSwiIU4GAKqoQ="; # inspire + version = "2.27.1"; # inspire + hash = "sha256-fjMkmAmq9BGsnwjUH8I/iCZveAPEYi9E9/R2WNg6rxo="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.27.0"; # jp2k - # hash = "sha256-WKWtNKv1sQrdrraCj9jmEODtIhCVF25HFbQNROdlyxg="; # jp2k + # version = "2.27.1"; # jp2k + # hash = "sha256-guNAdKOu32t0a648nuUjkt5bu17OKLAn6QXYeyAe1ZA="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.27.0"; # libjpeg-turbo - hash = "sha256-tMov4w8Kfbrr7hkNK4o+XFUuenyidCem7Z36KXinfTE="; # libjpeg-turbo + version = "2.27.1"; # libjpeg-turbo + hash = "sha256-ZAIQJzzDNSgCX4BUchyRktobJkyLHgWYwfPz8B9vNTQ="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.27.0"; # mapml - hash = "sha256-HONocKWnjkGqGRmtDxcJSwnDHwVouY6YeORRBjAbu4M="; # mapml + version = "2.27.1"; # mapml + hash = "sha256-znx6KjpTT109wG2wsTyvwKFcij29TVJ0cOkEIJw1D0g="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.27.0"; # mbstyle - hash = "sha256-c1QijJj/WfbTxc4vM55lz+wx2PW4BY3tXneSM+3zXRA="; # mbstyle + version = "2.27.1"; # mbstyle + hash = "sha256-t2g9Pm1PsfbiP1UWHcZaILZQFeOxnKUMXGS1sJfQcVg="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.27.0"; # metadata - hash = "sha256-5b9gtSzP9DOyhwoNdFVnv08WjlH+m0ZFPO+jqtbUJ1A="; # metadata + version = "2.27.1"; # metadata + hash = "sha256-DPD83rrjn8oPRXn28EFDgvxdhUtI3goPN2FpyPjyGks="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.27.0"; # mongodb - hash = "sha256-Y9KQ7lqfCnPfTdPUzidi9wNZPeiTTqB+4lf5q7mSQ88="; # mongodb + version = "2.27.1"; # mongodb + hash = "sha256-lVaEOf91CKBYfI8QLXhERfQ+aWNTTok2DveiZlWygjQ="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.27.0"; # monitor - hash = "sha256-uAkOudY7yACJ9A+FxcKSDUhGiID+uTvBibCejFwEiT0="; # monitor + version = "2.27.1"; # monitor + hash = "sha256-goZz5+dxB787hjcoR/Cmo92mw+rhpoooETzxg8bQ4eE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.27.0"; # mysql - hash = "sha256-qA3l9gx4AuqqbPHfQkbvJNYfURrBSnmq4S4nEPrFpO4="; # mysql + version = "2.27.1"; # mysql + hash = "sha256-jn+zmnrJHWw6/OXCnEpoBPtUALhINjL42va1+eGXgeU="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.27.0"; # netcdf - hash = "sha256-3pxGeIWcsBnJMdZjupOR/GmglxYWJp8KjJsmZSCRK00="; # netcdf + version = "2.27.1"; # netcdf + hash = "sha256-W/ICO05gBf5o6ZAc8vbxv9ZWd02m6AMQKqyimpVvRX8="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.27.0"; # netcdf-out - hash = "sha256-GfwJqdoO1Z265OmfAvjoKy0/DLX8e06Mu58o4Zps4q0="; # netcdf-out + version = "2.27.1"; # netcdf-out + hash = "sha256-0l74QlXo3CwTja2DDx8fmD9DTJV3S6fdCi2r6oq6UwE="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.27.0"; # ogr-wfs + version = "2.27.1"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-FX3sojRnR6FQSFSK4n62w/lrPbHTdbLn9NtR2nE/3dU="; # ogr-wfs + hash = "sha256-UXTpC4vd/2lq2mRMaTEwiIb58NtnsM+PEX2F6hsCv3s="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.27.0"; # ogr-wps + version = "2.27.1"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-Nb7rkbZPw85+EAcR+ist4iW16HVfsH9cSYwplHyO4RY="; # ogr-wps + hash = "sha256-GgVVGEBm7ci4Qxe+hNiIuGGOoJQRvaZE+NYKY0ZJlAQ="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.27.0"; # oracle - hash = "sha256-4KnZ48oKmgap3qZiJE4TSCQZpMvCQd4PULWponW5f1c="; # oracle + version = "2.27.1"; # oracle + hash = "sha256-7NH0XW+dZWIgJ8rwzNjCXLS2c4lCFg0FzNM8AD17Z3E="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.27.0"; # params-extractor - hash = "sha256-0NnL87Cn/DcLXTnBJhgcGHNmC6SYKRc7TY+4r7VcYJQ="; # params-extractor + version = "2.27.1"; # params-extractor + hash = "sha256-Z3pM5Mt1RE1+aDfsjcMrx4u6SvUzOUQmrmfghCCQIYk="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.27.0"; # printing - hash = "sha256-10uBc9ZI9M9m5vmKMXfB1TieJBr7cx/SeD1AiXNVJo8="; # printing + version = "2.27.1"; # printing + hash = "sha256-/kkUQpARHi2J/+4Tc9z7pVGLhnwbrlxOxiUlbg646KQ="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.27.0"; # pyramid - hash = "sha256-K38fYjM0Oh+FHT5Wadjuc3KIhFP2x5q5cxW5aucZNNw="; # pyramid + version = "2.27.1"; # pyramid + hash = "sha256-b4ZZNXHOgywXkPwTWBANyl0r1bok4bybusI0tKZ7rY8="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.27.0"; # querylayer - hash = "sha256-5OPfTUB0d08jWjxWd77BxffZgx+eM5eJX9bX0kt/WpM="; # querylayer + version = "2.27.1"; # querylayer + hash = "sha256-8leo1ZtrYbN9XISJLVZvOF34arOEnh0Y8CIeWih8XOE="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.27.0"; # sldservice - hash = "sha256-rWIbWCsX4Hkank0L02sluTF137Y6Pex15Gobiwv2pNM="; # sldservice + version = "2.27.1"; # sldservice + hash = "sha256-nKG1/+NwmTaardqZAhB4A1QV6bPxc30jW9Ip/q2vUJ0="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.27.0"; # sqlserver - hash = "sha256-ghf3z9b586RUgvicyOXlW2K8Uq9TolRb7CrcKT1Jt1M="; # sqlserver + version = "2.27.1"; # sqlserver + hash = "sha256-aqQf7NwUPnNn9Byu8YmbMnsU3n3aq832rvXbvicQsrM="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.27.0"; # vectortiles - hash = "sha256-ho/Vp1cFq2/xY9fIaQUR+vBQ6Vfdf+Z2eYvL7eI1qMY="; # vectortiles + version = "2.27.1"; # vectortiles + hash = "sha256-8nITeBDeFX6bDx+2Sn4yHfb333XUdNGPV6I883nZLV0="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.27.0"; # wcs2_0-eo - hash = "sha256-GcoOT3JNQPUN8ETX4spJXteJvbNM9+YO85FH+dw3oSg="; # wcs2_0-eo + version = "2.27.1"; # wcs2_0-eo + hash = "sha256-y3QOWFmYW+dxIAAlolcotJ0oNulRIJKvLeQqSTZKq/w="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.27.0"; # web-resource - hash = "sha256-4TGt9MklLWbJexY7kjT+ijIX/V4OLw7U6mDkBoVXuwk="; # web-resource + version = "2.27.1"; # web-resource + hash = "sha256-hfP/qnb4isWg4eoxfBCDpiLS4GBG/ysrGBE6HVbglMg="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.27.0"; # wmts-multi-dimensional - hash = "sha256-8I3XbAToqTgwf4y+C3ulAhCY7axyS739GV4+jxwO33g="; # wmts-multi-dimensional + version = "2.27.1"; # wmts-multi-dimensional + hash = "sha256-/KfE5dLvbSeMn/w7NYKQtUIY/Wb1oWeLvdMEqgrNAhg="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.27.0"; # wps - hash = "sha256-9OrjyVaf9JzDPXyqHqqg51aAllhcAf4bOvQQyV1dHpI="; # wps + version = "2.27.1"; # wps + hash = "sha256-rsBUWUthRrBkSNIzZZZzIy56bsJYt9zy3cIzWQVHVGc="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.27.0"; # wps-cluster-hazelcast - # hash = "sha256-amHfS5eBRoiMdj3wJzRNg9krYo5DJrCvCvhtj/Z9mUw="; # wps-cluster-hazelcast + # version = "2.27.1"; # wps-cluster-hazelcast + # hash = "sha256-W0hIz/Bx/x0ATLhcljSWa9/qzltt3FKlWyxub4Lnsx0="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.27.0"; # wps-download - hash = "sha256-vQpSGiOUh9N4PDQ4w/mTNjooz0lYDXwwRpZsq9VhEMA="; # wps-download + version = "2.27.1"; # wps-download + hash = "sha256-gt3u/zm8ME99d7zJV1EHQQYjC1IZyG7f5pV+Zt2XeJU="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.27.0"; # wps-jdbc - hash = "sha256-YWBOLL3X6Ztv+9EWmHKd5N020+qkVNtXXbObSlBhp2s="; # wps-jdbc + version = "2.27.1"; # wps-jdbc + hash = "sha256-5RtViHAgqAtnHQolqGMC7QYgnwQmn/sO4WdUx2gyxe8="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.27.0"; # ysld - hash = "sha256-fPF4LM0WC4YaAMnPhz3A/XXOoMu+v8TsO6XIcXHWRi4="; # ysld + version = "2.27.1"; # ysld + hash = "sha256-DvQ8b6ODmU09Qixwe14wze92ktWyt54+zaEMfXjiEko="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 0822e0f42b29..47ee80b6c1a7 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "geoserver"; - version = "2.27.0"; + version = "2.27.1"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${finalAttrs.version}/geoserver-${finalAttrs.version}-bin.zip"; - hash = "sha256-bhL+u+BoKgW2cwOXEzaq0h07dKFz9u9WB2jW8nAF0vI="; + hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk="; }; sourceRoot = "source"; From 50e7996cfae2d64e8f5f6b7dbbff0b46f85697d5 Mon Sep 17 00:00:00 2001 From: David Hagege Date: Sun, 8 Jun 2025 21:00:20 +0200 Subject: [PATCH 34/70] harlequin: Add tree-sitter-sql as dependency --- pkgs/by-name/ha/harlequin/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index fccaaac2c7ec..30f190825fb0 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -26,6 +26,7 @@ python3Packages.buildPythonApplication rec { "pyarrow" "textual" "syrupy" + "tree-sitter-sql" ]; build-system = with python3Packages; [ poetry-core ]; @@ -48,6 +49,7 @@ python3Packages.buildPythonApplication rec { textual-fastdatatable textual-textarea tomlkit + tree-sitter-sql ] ++ lib.optionals withPostgresAdapter [ harlequin-postgres ] ++ lib.optionals withBigQueryAdapter [ harlequin-bigquery ]; From 8d8285253bb1933273d011c85fb8bddb5407be37 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 8 Jun 2025 23:22:29 +0400 Subject: [PATCH 35/70] geoserver: modernize --- pkgs/by-name/ge/geoserver/package.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 47ee80b6c1a7..dd1194979e00 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -17,13 +17,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-7IrnznWa5NI/2gFHVTRQ0IerOkodStbr0aGpKPpeLQk="; }; - sourceRoot = "source"; - - unpackPhase = '' - runHook preUnpack - unzip $src -d "$sourceRoot" - runHook postUnpack - ''; + sourceRoot = "."; patches = [ # set GEOSERVER_DATA_DIR to current working directory if not provided @@ -92,12 +86,12 @@ stdenv.mkDerivation (finalAttrs: { updateScript = ./update.sh; }; - meta = with lib; { + meta = { description = "Open source server for sharing geospatial data"; homepage = "https://geoserver.org/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.gpl2Plus; - teams = [ teams.geospatial ]; - platforms = platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.gpl2Plus; + teams = [ lib.teams.geospatial ]; + platforms = lib.platforms.all; }; }) From a91a66d4ca43fedecb62c720be943e3409edf6fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 19:33:52 +0000 Subject: [PATCH 36/70] greenmask: 0.2.11 -> 0.2.12 --- pkgs/by-name/gr/greenmask/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 48daf3df6d10..c3574cde1a4f 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "greenmask"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${version}"; - hash = "sha256-KHM/r4zDJrZMIC7+Kp+98xhV5r4zkpxc1ffqf0jgnLs="; + hash = "sha256-Tgr6olU8EBiiHX4fNOL6EXdrFs2eckFk4ooBBoxc+ms="; }; - vendorHash = "sha256-g3/WuLDb4mAzklT+nxQ1U/l+JDzSubENMB5hWjIaIIU="; + vendorHash = "sha256-t2U65GAGBGdMRXPTkCQCuXfLuqohA6erTlvAN/xx/ek="; subPackages = [ "cmd/greenmask/" ]; From 584d060e65155dd3375024d1c4578c9a4055f448 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 20:26:01 +0000 Subject: [PATCH 37/70] cargo-tally: 1.0.64 -> 1.0.65 --- pkgs/by-name/ca/cargo-tally/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 0caf6b7bec2b..129dd87cf991 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.64"; + version = "1.0.65"; src = fetchCrate { inherit pname version; - hash = "sha256-5eRDKGocAdK8jyDrbEOEQxS4ykneTDbDfXvVU/AH4f8="; + hash = "sha256-cvMB/hMq0LCfuXHX1Gg0c3i69T1uQWKIddUru5dcg7g="; }; useFetchCargoVendor = true; - cargoHash = "sha256-9p5IfGfOWyDanaUt1h6bnq4mDxp+VdU4scNdWGRiWYE="; + cargoHash = "sha256-ReVLeyQY08i1sH6IujeLK8y1+PfPm8BoYInzbTHHnlw="; meta = { description = "Graph the number of crates that depend on your crate over time"; From 5eb7eb17f0a36993a31594ad3d32ce1a2c26c47d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Jun 2025 21:02:03 +0000 Subject: [PATCH 38/70] python3Packages.jupytext: 1.17.1 -> 1.17.2 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index cffbf7dab1e4..e7abcd5c6105 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; src = fetchFromGitHub { owner = "mwouts"; repo = "jupytext"; tag = "v${version}"; - hash = "sha256-Rkz2rite0hKcts4+3SmFsDF6tH2kQa4d2DtyZsAx3rA="; + hash = "sha256-xMmtppXect+PRlEp2g0kJurALVvcfza+FBbZbK2SbHc="; }; nativeBuildInputs = [ From dd23a4ec894d360c776811f5c9df6cd220f0a7a8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Jun 2025 00:15:50 +0200 Subject: [PATCH 39/70] python3Packages.jupyter-book: skip flaky test --- pkgs/development/python-modules/jupyter-book/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 385379e9f89f..729289a8a4b7 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, @@ -116,6 +115,7 @@ buildPythonPackage rec { # pytest.PytestUnraisableExceptionWarning: Exception ignored in: # ResourceWarning: unclosed database in "test_clean_book" + "test_clean_html" "test_clean_html_latex" "test_clean_latex" ]; From 648da7bb86eca60778f10b7a201ff5b6591bd4f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 22:30:27 +0000 Subject: [PATCH 40/70] vacuum-go: 0.16.13 -> 0.17.0 --- pkgs/by-name/va/vacuum-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 008eb83705e3..49920bddcc35 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.16.13"; + version = "0.17.0"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; # using refs/tags because simple version gives: 'the given path has multiple possibilities' error tag = "v${finalAttrs.version}"; - hash = "sha256-S4YhPXPSB60infsjkI1GdPrBYb0bXoj0+rc9GINuh3Y="; + hash = "sha256-IpJI+RD5TNsYaZhf3U/VD2CqW5ebutKvZRUOrwD2rGU="; }; - vendorHash = "sha256-rzJtYxnRWtSmMPeKEbBy6I2DFEOLEJ1Uj+nPpTKIDhw="; + vendorHash = "sha256-4cYG8ilWSI+bSoEBpohN6Fr3kmsBUNmbz0iyHmiCDgw="; env.CGO_ENABLED = 0; ldflags = [ From 74799e9308d5262a241e551822caa2f7790e8da8 Mon Sep 17 00:00:00 2001 From: David Hagege Date: Sun, 8 Jun 2025 21:01:15 +0200 Subject: [PATCH 41/70] harlequin: 2.0.0 -> 2.1.2 --- pkgs/by-name/ha/harlequin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 30f190825fb0..f39be8baec1f 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -11,21 +11,20 @@ }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "2.0.0"; + version = "2.1.2"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; tag = "v${version}"; - hash = "sha256-IUzN+rWL69TUUS9npcmfSAPqy/8SYNusNAN/muCMqNI="; + hash = "sha256-uHzhAI8ppp6aoveMPcLCQX2slhbor5Qy+IoTui+RP7M="; }; pythonRelaxDeps = [ "numpy" "pyarrow" "textual" - "syrupy" "tree-sitter-sql" ]; @@ -42,6 +41,7 @@ python3Packages.buildPythonApplication rec { numpy packaging platformdirs + pyarrow questionary rich-click sqlfmt From 5c4ede54b4917fb79fd35692f19a2543fec736f7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 8 Jun 2025 14:42:08 +0200 Subject: [PATCH 42/70] python3Packages.skorch: disable package on darwin --- pkgs/development/python-modules/skorch/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 0cb024b3ce2f..1b88c9a8ed46 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -96,5 +96,10 @@ buildPythonPackage rec { changelog = "https://github.com/skorch-dev/skorch/blob/master/CHANGES.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bcdarwin ]; + badPlatforms = [ + # Most tests fail with: + # Fatal Python error: Segmentation fault + lib.systems.inspect.patterns.isDarwin + ]; }; } From 4fca7dcdaf5516ce0176180eab2e8a8b66f55a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 23:52:37 +0000 Subject: [PATCH 43/70] python3Packages.mkdocstrings-python: 1.16.11 -> 1.16.12 --- .../python-modules/mkdocstrings-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix index 062556804584..d0132580ed36 100644 --- a/pkgs/development/python-modules/mkdocstrings-python/default.nix +++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "mkdocstrings-python"; - version = "1.16.11"; + version = "1.16.12"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "python"; tag = version; - hash = "sha256-Vee8pNslf/nELnIeMPkuBsbMVLLcK5CyIAaKTh/OEMM="; + hash = "sha256-NL5gn8HgT0hvIlUDs//sErAaSVXvxLDJGT7nZX65ZVU="; }; build-system = [ pdm-backend ]; From 5ccca8674f04d6bf8826fd7bb492571ffedd215a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 00:15:48 +0000 Subject: [PATCH 44/70] telepresence2: 2.22.4 -> 2.22.6 --- pkgs/by-name/te/telepresence2/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix index 07514f4687a3..daaddfc0690c 100644 --- a/pkgs/by-name/te/telepresence2/package.nix +++ b/pkgs/by-name/te/telepresence2/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.22.4"; + version = "2.22.6"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-ECuu6uMsY5vZVrMJknnd5IH0BZ2yVBTKIIC/Q8RARs8="; + hash = "sha256-YM6+vXPnkI02VwKOxzk1etpGskTjyzRmy3ro3/XXMhA="; }; propagatedBuildInputs = [ @@ -51,7 +51,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-+l+Dtyq+9u+Lc6yF++KnX2DixVVfPX+oFUn3lq6B/1U="; + vendorHash = "sha256-tP6SepFccR35vIM6mbmyb7QumpJM34gX5DAQazTQjkM="; ldflags = [ "-s" From 7e86f64dcb66a7312df2409427749a3b445ec69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 9 Jun 2025 01:59:26 +0200 Subject: [PATCH 45/70] paperless-ngx: 2.16.2 -> 2.16.3 Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.16.3 Also reduce max cores to reduce flakiness of tests... --- pkgs/by-name/pa/paperless-ngx/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix index b5ac70c8501a..24a39d8106aa 100644 --- a/pkgs/by-name/pa/paperless-ngx/package.nix +++ b/pkgs/by-name/pa/paperless-ngx/package.nix @@ -26,13 +26,13 @@ xorg, }: let - version = "2.16.2"; + version = "2.16.3"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; tag = "v${version}"; - hash = "sha256-w6VS3m661EvLGk1lVbTAYNzwVgXjvegn0KByGDBFjz0="; + hash = "sha256-mtzr/rRzcYcZl9tUkhxEKoFQWm1QTToOYZJXhynwDmk="; }; python = python3.override { @@ -69,7 +69,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit pname version src; - hash = "sha256-tSBpZ+1aPLUI0SKpOyKo+OLsJZiyDCxRb+5hKMPrxL8="; + hash = "sha256-Z7c+AstVnxbPnEhc51qSqOYhRXqNJVwTvgHFcFp+pYg="; }; nativeBuildInputs = @@ -134,8 +134,8 @@ python.pkgs.buildPythonApplication rec { postPatch = '' # pytest-xdist with to many threads makes the tests flaky - if (( $NIX_BUILD_CORES > 4)); then - NIX_BUILD_CORES=4 + if (( $NIX_BUILD_CORES > 3)); then + NIX_BUILD_CORES=3 fi substituteInPlace pyproject.toml \ --replace-fail '"--numprocesses=auto",' "" \ From 4372fea58b3d1c83844d88740adadc56384c0006 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 02:00:35 +0000 Subject: [PATCH 46/70] pinta: 3.0 -> 3.0.1 --- pkgs/by-name/pi/pinta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pi/pinta/package.nix b/pkgs/by-name/pi/pinta/package.nix index e04cfa245bb5..1d211d97b1a6 100644 --- a/pkgs/by-name/pi/pinta/package.nix +++ b/pkgs/by-name/pi/pinta/package.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "Pinta"; - version = "3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "PintaProject"; repo = "Pinta"; rev = version; - hash = "sha256-87uzUIgivBI2W+vJV/LflxJoUPJCW5SlodwcC1pSOUk="; + hash = "sha256-TU4WBrWnhTQQM+OrBq9hpvrihittKTSS0Zo5laL98mE="; }; nativeBuildInputs = [ From 0656506b748ba63352b5d0c8514228ff3f79e83a Mon Sep 17 00:00:00 2001 From: Sean Behan Date: Sun, 8 Jun 2025 20:50:09 -0400 Subject: [PATCH 47/70] sway-unwrapped: 1.10.1 -> 1.11 Diff: https://github.com/swaywm/sway/compare/1.10.1...1.11 Changelog: https://github.com/swaywm/sway/releases/tag/1.11 --- pkgs/by-name/sw/sway-unwrapped/package.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/sway-unwrapped/package.nix b/pkgs/by-name/sw/sway-unwrapped/package.nix index 279e711c923b..22707fc19d99 100644 --- a/pkgs/by-name/sw/sway-unwrapped/package.nix +++ b/pkgs/by-name/sw/sway-unwrapped/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "sway-unwrapped"; - version = "1.10.1"; + version = "1.11"; inherit enableXWayland @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "swaywm"; repo = "sway"; rev = finalAttrs.version; - hash = "sha256-uBtQk8uhW/i8lSbv6zwsRyiiImFBw1YCQHVWQ8jot5w="; + hash = "sha256-xMrexVDpgkGnvAAglshsh7HjvcbU2/Q6JLUd5J487qg="; }; patches = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f2545fc9ec4..a88d3a0065ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2060,7 +2060,7 @@ with pkgs; coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { }; sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix { - wlroots = wlroots_0_18; + wlroots = wlroots_0_19; }; cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; From 20c8dee33d659d5cbc72d4f93c010eccfe96a9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 02:57:42 +0000 Subject: [PATCH 48/70] hydralauncher: 3.5.2 -> 3.6.0 --- pkgs/by-name/hy/hydralauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index cd8c6338d2ff..2047121946c0 100644 --- a/pkgs/by-name/hy/hydralauncher/package.nix +++ b/pkgs/by-name/hy/hydralauncher/package.nix @@ -6,10 +6,10 @@ }: let pname = "hydralauncher"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-B1eo/t6HEy+C+5yBLySXToDFPoZb1UeQshZTZ6KiibA="; + hash = "sha256-7qXVBS4HTLdvmMfyhE5EoHblovqKmIJuh7FSl5lo224="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From ded369c957f4bea43a8cdd4873d7e0e4a93b7541 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 03:24:08 +0000 Subject: [PATCH 49/70] ledger-live-desktop: 2.113.2 -> 2.115.1 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index ab9cc2ed715b..db46ef540a8a 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "2.113.2"; + version = "2.115.1"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-jJvIncD1vGZ2t0Rpl42AoVGKPlLGhMsoU91//rxOWnw="; + hash = "sha256-JLX1EbtrvkQPLGXlvn2pv1p1nT2mJ/yng4VumxV2z6E="; }; appimageContents = appimageTools.extractType2 { From 1cf4b5ef9fdb85bfa54be27ed158025a47d0996d Mon Sep 17 00:00:00 2001 From: Conroy Cheers Date: Sun, 8 Jun 2025 22:45:13 +1000 Subject: [PATCH 50/70] python312Packages.vllm: 0.8.3 -> 0.9.0.1 Co-authored-by: Gaetan Lepage --- .../vllm/0005-drop-intel-reqs.patch | 12 +++ .../python-modules/vllm/default.nix | 82 +++++++++++++------ 2 files changed, 71 insertions(+), 23 deletions(-) create mode 100644 pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch diff --git a/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch new file mode 100644 index 000000000000..d324661f149a --- /dev/null +++ b/pkgs/development/python-modules/vllm/0005-drop-intel-reqs.patch @@ -0,0 +1,12 @@ +diff --git a/requirements/cpu.txt b/requirements/cpu.txt +index 121330158..d41918883 100644 +--- a/requirements/cpu.txt ++++ b/requirements/cpu.txt +@@ -20,7 +20,3 @@ datasets # for benchmark scripts + + # cpu cannot use triton 3.3.0 + triton==3.2.0; platform_machine == "x86_64" +- +-# Intel Extension for PyTorch, only for x86_64 CPUs +-intel-openmp==2024.2.1; platform_machine == "x86_64" +-intel_extension_for_pytorch==2.7.0; platform_machine == "x86_64" diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix index 7cbfb50fce01..b29cfbeeab8e 100644 --- a/pkgs/development/python-modules/vllm/default.nix +++ b/pkgs/development/python-modules/vllm/default.nix @@ -3,8 +3,8 @@ stdenv, python, buildPythonPackage, - pythonRelaxDepsHook, fetchFromGitHub, + fetchpatch, symlinkJoin, autoAddDriverRunpath, @@ -15,7 +15,6 @@ packaging, setuptools, setuptools-scm, - wheel, # dependencies which, @@ -63,6 +62,14 @@ python-json-logger, python-multipart, llvmPackages, + opentelemetry-sdk, + opentelemetry-api, + opentelemetry-exporter-otlp, + bitsandbytes, + flashinfer, + + # internal dependency - for overriding in overlays + vllm-flash-attn ? null, cudaSupport ? torch.cudaSupport, cudaPackages ? { }, @@ -88,8 +95,8 @@ let cutlass = fetchFromGitHub { owner = "NVIDIA"; repo = "cutlass"; - tag = "v3.8.0"; - hash = "sha256-oIzlbKRdOh6gp6nRZ8udLSqleBFoFtgM7liCBlHZLOk="; + tag = "v3.9.2"; + hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI="; }; flashmla = stdenv.mkDerivation { @@ -119,36 +126,41 @@ let ''; }; - vllm-flash-attn = stdenv.mkDerivation { + vllm-flash-attn' = lib.defaultTo (stdenv.mkDerivation { pname = "vllm-flash-attn"; # https://github.com/vllm-project/flash-attention/blob/${src.rev}/vllm_flash_attn/__init__.py - version = "2.7.2.post1"; + version = "2.7.4.post1"; # grep for GIT_TAG in the following file # https://github.com/vllm-project/vllm/blob/v${version}/cmake/external_projects/vllm_flash_attn.cmake src = fetchFromGitHub { owner = "vllm-project"; repo = "flash-attention"; - rev = "dc9d410b3e2d6534a4c70724c2515f4def670a22"; - hash = "sha256-ZQ0bOBIb+8IMmya8dmimKQ17KTBplX81IirdnBJpX5M="; + rev = "8798f27777fb57f447070301bf33a9f9c607f491"; + hash = "sha256-UTUvATGN1NU/Bc8qo078q6bEgILLmlrjL7Yk2iAJhg4="; }; dontConfigure = true; - # vllm-flash-attn normally relies on `git submodule update` to fetch cutlass - buildPhase = '' - rm -rf csrc/cutlass - ln -sf ${cutlass} csrc/cutlass - ''; + # vllm-flash-attn normally relies on `git submodule update` to fetch cutlass and composable_kernel + buildPhase = + '' + rm -rf csrc/cutlass + ln -sf ${cutlass} csrc/cutlass + '' + + lib.optionalString (rocmSupport) '' + rm -rf csrc/composable_kernel; + ln -sf ${rocmPackages.composable_kernel} csrc/composable_kernel + ''; installPhase = '' cp -rva . $out ''; - }; + }) vllm-flash-attn; cpuSupport = !cudaSupport && !rocmSupport; - # https://github.com/pytorch/pytorch/blob/v2.6.0/torch/utils/cpp_extension.py#L2046-L2048 + # https://github.com/pytorch/pytorch/blob/v2.7.0/torch/utils/cpp_extension.py#L2343-L2345 supportedTorchCudaCapabilities = let real = [ @@ -170,6 +182,11 @@ let "9.0" "9.0a" "10.0" + "10.0a" + "10.1" + "10.1a" + "12.0" + "12.0a" ]; ptx = lists.map (x: "${x}+PTX") real; in @@ -229,7 +246,7 @@ in buildPythonPackage rec { pname = "vllm"; - version = "0.8.3"; + version = "0.9.0.1"; pyproject = true; stdenv = torch.stdenv; @@ -238,13 +255,19 @@ buildPythonPackage rec { owner = "vllm-project"; repo = "vllm"; tag = "v${version}"; - hash = "sha256-LiEBkVwJTT4WoCTk9pI0ykTjmv1pDMzksmFwVktoxMY="; + hash = "sha256-gNe/kdsDQno8Fd6mo29feWmbyC0c2+kljlVxY4v7R9U="; }; patches = [ + (fetchpatch { + name = "remove-unused-opentelemetry-semantic-conventions-ai-dep.patch"; + url = "https://github.com/vllm-project/vllm/commit/6a5d7e45f52c3a13de43b8b4fa9033e3b342ebd2.patch"; + hash = "sha256-KYthqu+6XwsYYd80PtfrMMjuRV9+ionccr7EbjE4jJE="; + }) ./0002-setup.py-nix-support-respect-cmakeFlags.patch ./0003-propagate-pythonpath.patch ./0004-drop-lsmod.patch + ./0005-drop-intel-reqs.patch ]; postPatch = @@ -259,6 +282,10 @@ buildPythonPackage rec { --replace-fail \ 'set(PYTHON_SUPPORTED_VERSIONS' \ 'set(PYTHON_SUPPORTED_VERSIONS "${lib.versions.majorMinor python.version}"' + + # Pass build environment PYTHONPATH to vLLM's Python configuration scripts + substituteInPlace CMakeLists.txt \ + --replace-fail '$PYTHONPATH' '$ENV{PYTHONPATH}' '' + lib.optionalString (nccl == null) '' # On platforms where NCCL is not supported (e.g. Jetson), substitute Gloo (provided by Torch) @@ -361,12 +388,17 @@ buildPythonPackage rec { xformers xgrammar numba + opentelemetry-sdk + opentelemetry-api + opentelemetry-exporter-otlp + bitsandbytes ] ++ uvicorn.optional-dependencies.standard ++ aioprometheus.optional-dependencies.starlette ++ lib.optionals cudaSupport [ cupy pynvml + flashinfer ]; dontUseCmakeConfigure = true; @@ -374,7 +406,7 @@ buildPythonPackage rec { [ (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${lib.getDev cutlass}") (lib.cmakeFeature "FLASH_MLA_SRC_DIR" "${lib.getDev flashmla}") - (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn}") + (lib.cmakeFeature "VLLM_FLASH_ATTN_SRC_DIR" "${lib.getDev vllm-flash-attn'}") ] ++ lib.optionals cudaSupport [ (lib.cmakeFeature "TORCH_CUDA_ARCH_LIST" "${gpuTargetString}") @@ -416,15 +448,19 @@ buildPythonPackage rec { pythonImportsCheck = [ "vllm" ]; - # updates the cutlass fetcher instead - passthru.skipBulkUpdate = true; + passthru = { + # make internal dependency available to overlays + vllm-flash-attn = vllm-flash-attn'; + # updates the cutlass fetcher instead + skipBulkUpdate = true; + }; - meta = with lib; { + meta = { description = "High-throughput and memory-efficient inference and serving engine for LLMs"; changelog = "https://github.com/vllm-project/vllm/releases/tag/v${version}"; homepage = "https://github.com/vllm-project/vllm"; - license = licenses.asl20; - maintainers = with maintainers; [ + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ happysalada lach ]; From 8896c64c22f4e104244e0b51662caebf40964039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 04:45:05 +0000 Subject: [PATCH 51/70] lib60870: 2.3.5 -> 2.3.6 --- pkgs/by-name/li/lib60870/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix index 79f910002cf8..a0913253a5ba 100644 --- a/pkgs/by-name/li/lib60870/package.nix +++ b/pkgs/by-name/li/lib60870/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lib60870"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "mz-automation"; repo = "lib60870"; rev = "v${finalAttrs.version}"; - hash = "sha256-TjphTBBGjzbevUR0N1GHK/nic1pAdjWeiqxEMLozQOc="; + hash = "sha256-9VqLl1pDmi8TauBA8uCyymzsYd3w4b5AKtqH7XW80N4="; }; sourceRoot = "${finalAttrs.src.name}/lib60870-C"; From 15392a876016dc4e6045d4aca043b15ba403fde7 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 8 Jun 2025 22:18:13 -0700 Subject: [PATCH 52/70] gcdemu: fix tray icon on wayland --- pkgs/applications/emulators/cdemu/gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/emulators/cdemu/gui.nix b/pkgs/applications/emulators/cdemu/gui.nix index 779f21ac2f20..90523e12ead6 100644 --- a/pkgs/applications/emulators/cdemu/gui.nix +++ b/pkgs/applications/emulators/cdemu/gui.nix @@ -9,6 +9,7 @@ intltool, adwaita-icon-theme, gdk-pixbuf, + libappindicator-gtk3, }: python3Packages.buildPythonApplication { @@ -35,6 +36,7 @@ python3Packages.buildPythonApplication { libnotify adwaita-icon-theme gdk-pixbuf + libappindicator-gtk3 ]; propagatedBuildInputs = with python3Packages; [ pygobject3 ]; From 4625cc989f098dd885532a9e556c35c3b5ebb975 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 06:54:21 +0000 Subject: [PATCH 53/70] python3Packages.ical: 10.0.0 -> 10.0.1 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 4ae8f0d97060..8e9cd282e614 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "10.0.0"; + version = "10.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-vEVhZ7UBftXsB5xq1LhwitV2Gl6kcR5P0ReJ+71SQFY="; + hash = "sha256-KUrsg42sNOtsmpS7rTPm1uiFU+jXbb25/Auk8Utp8Ks="; }; build-system = [ setuptools ]; From 5c302d573b894d28f2197c0f56c0314033d67651 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 07:31:51 +0000 Subject: [PATCH 54/70] opa-envoy-plugin: 1.4.2-envoy -> 1.5.1-envoy --- pkgs/by-name/op/opa-envoy-plugin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix index 7d2ae1fb3fd4..5980e4088814 100644 --- a/pkgs/by-name/op/opa-envoy-plugin/package.nix +++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix @@ -14,13 +14,13 @@ assert buildGoModule rec { pname = "opa-envoy-plugin"; - version = "1.4.2-envoy"; + version = "1.5.1-envoy"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa-envoy-plugin"; tag = "v${version}"; - hash = "sha256-DRW9VaxKd+MRcC3Ay7f9sblWTY9/RUNfH76LgPEhTas="; + hash = "sha256-rctYzH47R3vFk/Xl9YwTrTHU6K1pZ3QcimH1JfDecDs="; }; vendorHash = null; From e6845d748b73d8ad73da9695c49623095bc122fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 07:33:42 +0000 Subject: [PATCH 55/70] llama-cpp: 5535 -> 5608 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index c0ac00cdc34b..a8b32d9a2a6c 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -72,13 +72,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "5535"; + version = "5608"; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-n6h4aiszPU7/JV3btPQEJBHeR/YrzVqOzNFAXNPSEAg="; + hash = "sha256-q3jw/x9GSI2Yp0DSM53g/jMuTeVakLfY9VsoJxq9who="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT From ca5775952eec82b3510fc17969d8e26cdd1767fb Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 9 Jun 2025 09:43:27 +0200 Subject: [PATCH 56/70] ci/check-cherry-picks: fix indent of truncation marker This needs to be indented the same way as the remaining code-block, otherwise the `` is not rendered correctly. --- ci/check-cherry-picks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/check-cherry-picks.sh b/ci/check-cherry-picks.sh index 6036d5a1529a..51efb543ad3f 100755 --- a/ci/check-cherry-picks.sh +++ b/ci/check-cherry-picks.sh @@ -121,7 +121,7 @@ while read -r new_commit_sha ; do # consider this too unlikely to happen, to deal with explicitly. max_length=10000 if [ "${#diff}" -gt $max_length ]; then - printf -v diff "%s\n\n[...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)" + printf -v diff "%s\n>\n> [...truncated...]" "$(echo "$diff" | head -c $max_length | head -n-1)" fi echo "$diff" >> $markdown_file echo '> ```' >> $markdown_file From db9f6a1122fc58b94c619bdda98437f7fdb66fd3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 May 2025 08:34:51 +0200 Subject: [PATCH 57/70] python312Packages.aardwolf: 0.2.11 -> 0.2.12 Diff: skelsec/aardwolf@0586591...0586591 Changelog: https://github.com/skelsec/aardwolf/releases/tag/0.2.12 --- .../development/python-modules/aardwolf/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 1b6ec2c19ec0..6a931ef1095f 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -13,7 +13,6 @@ iconv, pillow, pyperclip, - pythonOlder, rustPlatform, rustc, setuptools, @@ -24,22 +23,20 @@ buildPythonPackage rec { pname = "aardwolf"; - version = "0.2.11"; + version = "0.2.12"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "skelsec"; repo = "aardwolf"; - rev = "0586591e948977ca5945252c893ba8f766ff8d28"; - hash = "sha256-daDxkQ7N0+yS2JOLfXJq4jv+5VQNnwtqIMy2p8j+Sag="; + tag = version; + hash = "sha256-CMO3qhxYmwB9kWIiHWV/0gAfs/yCnHzpfNYLTy4wX78="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; sourceRoot = "${src.name}/aardwolf/utils/rlers"; - hash = "sha256-doBraJQtekrO/ZZV9KFz7BdIgBVVWtQztUS2Gz8dDdA="; + hash = "sha256-+2hENnrG35eRgQwtCCJUux9mYEkzD2astLgOqWHrH/M="; }; cargoRoot = "aardwolf/utils/rlers"; @@ -78,7 +75,7 @@ buildPythonPackage rec { mainProgram = "ardpscan"; homepage = "https://github.com/skelsec/aardwolf"; changelog = "https://github.com/skelsec/aardwolf/releases/tag/${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 96c0d6800a0d7c188fca9c9754657822e6599e0d Mon Sep 17 00:00:00 2001 From: Mahyar Mirrashed Date: Sun, 8 Jun 2025 23:54:40 -0500 Subject: [PATCH 58/70] vimPlugins.schema-companion-nvim: init at 2025-06-05 fix: add plenary-nvim as dependency for schema-companion-nvim --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4b693a5a0583..ef9b2813ab76 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13148,6 +13148,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + schema-companion-nvim = buildVimPlugin { + pname = "schema-companion.nvim"; + version = "2025-06-05"; + src = fetchFromGitHub { + owner = "cenk1cenk2"; + repo = "schema-companion.nvim"; + rev = "a39cbf5a31ae7aec71e5aaec5e6d409f22b05099"; + sha256 = "1s0lqxz1rh4f7jspl45pa9981zwz0i0h9c4ml0zy55y926454339"; + }; + meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/"; + meta.hydraPlatforms = [ ]; + }; + scnvim = buildVimPlugin { pname = "scnvim"; version = "2025-01-29"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 2035c0ac0d44..a74a8dc5c5b5 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3011,6 +3011,10 @@ in dependencies = [ self.plenary-nvim ]; }; + schema-companion-nvim = super.schema-companion-nvim.overrideAttrs { + dependencies = [ self.plenary-nvim ]; + }; + scretch-nvim = super.scretch-nvim.overrideAttrs { }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 578dbed86586..d082b27c10a5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1009,6 +1009,7 @@ https://github.com/hauleth/sad.vim/,, https://github.com/vmware-archive/salt-vim/,, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim https://github.com/lewis6991/satellite.nvim/,HEAD, +https://github.com/cenk1cenk2/schema-companion.nvim/,HEAD, https://github.com/davidgranstrom/scnvim/,HEAD, https://github.com/tiagovla/scope.nvim/,HEAD, https://github.com/0xJohnnyboy/scretch.nvim/,HEAD, From 2cd30b1b7762ac8c72c2ea1e178a0fb599d3db02 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 4 Jun 2025 22:20:07 +0200 Subject: [PATCH 59/70] nh: 4.1.0 -> 4.1.2 --- pkgs/by-name/nh/nh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 85e860a9bbde..e2039517580b 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -18,13 +18,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nh"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nh"; tag = "v${finalAttrs.version}"; - hash = "sha256-OiuhBrJe1AyVxC+AV4HMJ+vhDvUfCyLpBmj+Fy7MDtM="; + hash = "sha256-v02NsZ589zzPq5xsCxyrG1/ZkFbbMkUthly50QdmYKo="; }; strictDeps = true; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-/tbmzGUd1b4oa+29+eFdkE4l8vxMoIdHx40YgErY9pY="; + cargoHash = "sha256-R2S0gbT3DD/Dtx8edqhD0fpDqe8AJgyLmlPoNEKm4BA="; passthru.updateScript = nix-update-script { }; From 26da6869647ad861549d0e5f4b82e128e857c669 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Jun 2025 09:43:32 +0000 Subject: [PATCH 60/70] home-assistant-custom-lovelace-modules.universal-remote-card: 4.5.3 -> 4.5.4 --- .../universal-remote-card/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix index 847e8209fa87..cfa2a9a62368 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/universal-remote-card/package.nix @@ -6,18 +6,18 @@ buildNpmPackage rec { pname = "universal-remote-card"; - version = "4.5.3"; + version = "4.5.4"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-AxPpKp7SjeSB8VqclDJgkArC9zmjIkLQx+RBWQX0sLM="; + hash = "sha256-WRDeHUp+uLBbPRNvIuRNXhm+yAgG1hwZiO0S0FLDOFY="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-KFgo1sKwCLmW0Il4tK2L+giF3th+YvVUWG3n+3HkRg4="; + npmDepsHash = "sha256-F1j7/QvP3rJTFLdOdF2/0Jf6sVLZ2EUwkbtNB5/6OBE="; installPhase = '' runHook preInstall From 3b45077527d36b1e50569b576a90f0a61f67cd83 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Jun 2025 09:04:10 +0200 Subject: [PATCH 61/70] python3Packages.islpy: 2025.1.5 -> 2025.2 Diff: https://github.com/inducer/islpy/compare/refs/tags/v2025.1.5...refs/tags/v2025.2 Changelog: https://github.com/inducer/islpy/releases/tag/v2025.2 --- .../python-modules/islpy/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index c7f6c53cb1bc..a996731db987 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -8,10 +8,11 @@ nanobind, ninja, pcpp, - scikit-build, - setuptools, + scikit-build-core, + typing-extensions, # buildInputs + imath, isl, # tests @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "islpy"; - version = "2025.1.5"; + version = "2025.2"; pyproject = true; src = fetchFromGitHub { owner = "inducer"; repo = "islpy"; tag = "v${version}"; - hash = "sha256-hzqxVLNKm63XliX5rDB54f6n1nJPVJJSAMmNTInbOEE="; + hash = "sha256-RMqqnhW8MibGhAhJZF/EjycFJ7E3j4aur0a6UaPyeIs="; }; build-system = [ @@ -35,19 +36,24 @@ buildPythonPackage rec { nanobind ninja pcpp - scikit-build - setuptools + scikit-build-core + typing-extensions ]; - buildInputs = [ isl ]; + buildInputs = [ + imath + isl + ]; dontUseCmakeConfigure = true; - preConfigure = '' - python ./configure.py \ - --no-use-shipped-isl \ - --isl-inc-dir=${lib.getDev isl}/include \ - ''; + pypaBuildFlags = [ + "--config-setting=cmake.define.USE_SHIPPED_ISL=OFF" + "--config-setting=cmake.define.USE_SHIPPED_IMATH=OFF" + "--config-setting=cmake.define.USE_BARVINOK=OFF" + "--config-setting=cmake.define.ISL_INC_DIRS:LIST='${lib.getDev isl}/include'" + "--config-setting=cmake.define.ISL_LIB_DIRS:LIST='${lib.getLib isl}/lib'" + ]; # Force resolving the package from $out to make generated ext files usable by tests preCheck = '' From 95cca8d853ffd96c6d9aa514fa397c483cacf954 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 8 Jun 2025 20:26:02 -0700 Subject: [PATCH 62/70] llvmPackages_git: 21.0.0-unstable-2025-06-06 -> 21.0.0-unstable-2025-06-08 --- pkgs/development/compilers/llvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 1762da6b16a8..329917fb3dfc 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -33,9 +33,9 @@ let "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I="; "20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ="; "21.0.0-git".gitRelease = { - rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d"; - rev-version = "21.0.0-unstable-2025-06-06"; - sha256 = "sha256-OtIRNU+AuUaPhAsd0Kn0odAdPJhkV/139+DR6Ls0XrE="; + rev = "90beda2aba3cac34052827c560449fcb184c7313"; + rev-version = "21.0.0-unstable-2025-06-08"; + sha256 = "sha256-+aTUb9Hg/upulKGLKNpqDYKES62mWkjuLZP07WGnBSc="; }; } // llvmVersions; From 4e7cd1b5f22211bc744faac81ae81deedc2e81e7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Jun 2025 12:24:24 +0200 Subject: [PATCH 63/70] vimPlugins.solarized-osaka-nvim: init at 2025-04-19 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 9 +++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 23 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ef9b2813ab76..a0a7b4bbca53 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -13513,6 +13513,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + solarized-osaka-nvim = buildVimPlugin { + pname = "solarized-osaka.nvim"; + version = "2025-04-19"; + src = fetchFromGitHub { + owner = "craftzdog"; + repo = "solarized-osaka.nvim"; + rev = "f796014c14b1910e08d42cc2077fef34f08e0295"; + sha256 = "0jy2hk4fc210jih30ybvisr9pliya1s3nazw4d131vh5k4p1xqi6"; + }; + meta.homepage = "https://github.com/craftzdog/solarized-osaka.nvim/"; + meta.hydraPlatforms = [ ]; + }; + sonokai = buildVimPlugin { pname = "sonokai"; version = "2025-04-16"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index a74a8dc5c5b5..a6bb82023418 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3098,6 +3098,15 @@ in ]; }; + solarized-osaka-nvim = super.solarized-osaka-nvim.overrideAttrs { + checkInputs = [ self.fzf-lua ]; + + nvimSkipModules = [ + # lua/solarized-osaka/extra/fzf.lua:55: color not found for header:FzfLuaTitle + "solarized-osaka.extra.fzf" + ]; + }; + spaceman-nvim = super.spaceman-nvim.overrideAttrs { # Optional telescope integration nvimSkipModules = "spaceman.adapters.telescope"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d082b27c10a5..46b6468a5c87 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1036,6 +1036,7 @@ https://github.com/folke/snacks.nvim/,HEAD, https://github.com/camspiers/snap/,, https://github.com/leath-dub/snipe.nvim/,HEAD, https://github.com/norcalli/snippets.nvim/,, +https://github.com/craftzdog/solarized-osaka.nvim/,HEAD, https://github.com/shaunsingh/solarized.nvim/,HEAD, https://github.com/sainnhe/sonokai/,, https://github.com/sQVe/sort.nvim/,HEAD, From a9f796fad162cc5015a3da05814bf0432f9323bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 07:33:04 +0000 Subject: [PATCH 64/70] crosvm: 0-unstable-2025-05-27 -> 0-unstable-2025-06-06 --- pkgs/by-name/cr/crosvm/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index fce56d962a87..eef6b3c0a398 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,19 +21,19 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2025-05-27"; + version = "0-unstable-2025-06-06"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "43034b2f649f987a8bbb7a757c5f9f761343cd57"; - hash = "sha256-ez7ciW17SDAjrXWeld51jyHeKdLUTw0aOBSheFlH3q4="; + rev = "7083e31d219cdcd57866c70144e1b39ddc008f0f"; + hash = "sha256-oZR4UcN8lDoqNoUFGLbIDDRO55noDX0xMWa8W0DbVl4="; fetchSubmodules = true; }; separateDebugInfo = true; useFetchCargoVendor = true; - cargoHash = "sha256-ZagGHo1DxSR51rvt0SKO1grhvKth5CuxXiCT6rKqGGk="; + cargoHash = "sha256-3NcQQZCsR3ekPBbe/ai8ke3MxBy0ONg1TJO9qLSH7jM="; nativeBuildInputs = [ pkg-config From ef9c29ae63e2d1f658fb7a6332d8767fb848970b Mon Sep 17 00:00:00 2001 From: Mio Date: Fri, 30 May 2025 22:51:03 +1200 Subject: [PATCH 65/70] element-desktop: add darwin to platforms It builds and runs on my darwin aarch64 device --- pkgs/by-name/el/element-desktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 84a743771187..72708fc1d0b1 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation ( changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; teams = [ teams.matrix ]; - inherit (electron.meta) platforms; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "element-desktop"; }; } From e837c2193c0112d84c20b76545a72346b434626a Mon Sep 17 00:00:00 2001 From: Mio Date: Fri, 30 May 2025 22:53:32 +1200 Subject: [PATCH 66/70] element-desktop: use electron.meta.platforms --- pkgs/by-name/el/element-desktop/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 72708fc1d0b1..3e8ae7ee091f 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation ( changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.asl20; teams = [ teams.matrix ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; + platforms = electron.meta.platforms ++ lib.platforms.darwin; mainProgram = "element-desktop"; }; } From 66c1b6e00334f6d7b9e2dc00d8a2f24b85f853ef Mon Sep 17 00:00:00 2001 From: DoctorDalek1963 Date: Mon, 9 Jun 2025 12:36:33 +0100 Subject: [PATCH 67/70] just-lsp: 0.2.2 -> 0.2.3 --- pkgs/by-name/ju/just-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index a153eb5bb1d7..640d14600782 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-lR3VtPS96gPUj4OVZLeQSHnss22hBTRBLUV8n2Y3E9M="; + hash = "sha256-1XxC09Q9UGKRzMb51mUjmTJd7vEp0FFqtUD/9cQZvC0="; }; - cargoHash = "sha256-eDjUYB5AN56hxolizw0KYb0Z/k28OWOUYOxhB/5pKV0="; + cargoHash = "sha256-mc1kYXfEF+oZO/GEBtCnKwt17LhvGDQK8RcOSsXKFjc="; passthru = { updateScript = nix-update-script { }; From de8f30ca6bf3a765558a16f9ae9be6c1c5eaf6a0 Mon Sep 17 00:00:00 2001 From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 9 Jun 2025 17:21:03 +0530 Subject: [PATCH 68/70] vesktop: 1.5.6 -> 1.5.7 (#415263) Diff: https://github.com/Vencord/Vesktop/compare/v1.5.6...v1.5.7 Release: https://github.com/Vencord/Vesktop/releases/tag/v1.5.7 --- .../ve/vesktop/disable_update_checking.patch | 14 +++++++------- pkgs/by-name/ve/vesktop/package.nix | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch index a134dc0fd169..2fcc1fc24be7 100644 --- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch +++ b/pkgs/by-name/ve/vesktop/disable_update_checking.patch @@ -1,12 +1,12 @@ diff --git a/src/main/index.ts b/src/main/index.ts -index 2e0d6f7..1108c0f 100644 +index 37fd471..d0a9e56 100644 --- a/src/main/index.ts +++ b/src/main/index.ts -@@ -20,7 +20,6 @@ import { isDeckGameMode } from "./utils/steamOS"; - if (IS_DEV) { - require("source-map-support").install(); - } else { +@@ -18,7 +18,6 @@ import { Settings, State } from "./settings"; + import { isDeckGameMode } from "./utils/steamOS"; + + if (!IS_DEV) { - autoUpdater.checkForUpdatesAndNotify(); } - - // Make the Vencord files use our DATA_DIR + + console.log("Vesktop v" + app.getVersion()); diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix index 48c57c269c81..de1b9f02c052 100644 --- a/pkgs/by-name/ve/vesktop/package.nix +++ b/pkgs/by-name/ve/vesktop/package.nix @@ -24,13 +24,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vesktop"; - version = "1.5.6"; + version = "1.5.7"; src = fetchFromGitHub { owner = "Vencord"; repo = "Vesktop"; rev = "v${finalAttrs.version}"; - hash = "sha256-hY707k3kpfbDaRsLisVQFUeWgsxkYJ29GTdQtdeC0X4="; + hash = "sha256-2YVaDfvhmuUx2fVm9PuMPQ3Z5iu7IHJ7dgF52a1stoM="; }; pnpmDeps = pnpm_10.fetchDeps { @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { src patches ; - hash = "sha256-pL4pxIB+tF9Lv5eQdLilvg/T4knjzPqBMbTxoZ3RqbI="; + hash = "sha256-C05rDd5bcbR18O6ACgzS0pQdWzB99ulceOBpW+4Zbqw="; }; nativeBuildInputs = From a21c18ab26ee1b05d5143d3f2bac6f768cc85442 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 14 Jan 2025 14:10:17 +0900 Subject: [PATCH 69/70] ocamlPackages.bigstringaf: 0.9.0 -> 0.10.0 Changelog: https://github.com/inhabitedtype/bigstringaf/releases/tag/0.10.0 Diff: https://github.com/inhabitedtype/bigstringaf/compare/0.9.0...0.10.0 --- pkgs/development/ocaml-modules/bigstringaf/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index f32bee87255d..27fa59e80f73 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -4,23 +4,25 @@ buildDunePackage, alcotest, pkg-config, + dune-configurator, }: buildDunePackage rec { pname = "bigstringaf"; - version = "0.9.0"; + version = "0.10.0"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - hash = "sha256-HXPjnE56auy2MI6HV2XuBX/VeqsO50HFzTul17lKEqE="; + hash = "sha256-p1hdB3ArOd2UX7S6YvXCFbYjEiXdMDmBaC/lFQgua7Q="; }; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ dune-configurator ]; + checkInputs = [ alcotest ]; doCheck = true; From 9a43f6bcdc6e8767c118da82a622e1bbaf0d2e01 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Tue, 14 Jan 2025 14:13:21 +0900 Subject: [PATCH 70/70] ocamlPackages.bigstringaf: modernize the derivation and add changelog and longDescription --- .../ocaml-modules/bigstringaf/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 27fa59e80f73..1de4d8312dfb 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; - rev = version; + tag = version; hash = "sha256-p1hdB3ArOd2UX7S6YvXCFbYjEiXdMDmBaC/lFQgua7Q="; }; @@ -28,6 +28,18 @@ buildDunePackage rec { meta = { description = "Bigstring intrinsics and fast blits based on memcpy/memmove"; + longDescription = '' + Bigstring intrinsics and fast blits based on memcpy/memmove + + The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not + widely-known, sometimes misused, and so programs that use Bigstrings are slower + than they have to be. And even if a library got that part right and exposed the + intrinsics properly, the compiler doesn't have any fast blits between + Bigstrings and other string-like types. + + So here they are. Go crazy. + ''; + changelog = "https://github.com/inhabitedtype/bigstringaf/releases/tag/${version}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage;