From e5161a15c9cf7584e38e81be60668e7ec02f9b90 Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 10 Oct 2025 16:20:24 +0800 Subject: [PATCH 01/22] gpt-box: 1.0.385 -> 1.0.395 --- pkgs/by-name/gp/gpt-box/gitHashes.json | 7 + pkgs/by-name/gp/gpt-box/package.nix | 46 +- pkgs/by-name/gp/gpt-box/pubspec.lock.json | 452 +++++++------------- pkgs/by-name/gp/gpt-box/update-gitHashes.py | 51 +++ 4 files changed, 234 insertions(+), 322 deletions(-) create mode 100644 pkgs/by-name/gp/gpt-box/gitHashes.json create mode 100755 pkgs/by-name/gp/gpt-box/update-gitHashes.py diff --git a/pkgs/by-name/gp/gpt-box/gitHashes.json b/pkgs/by-name/gp/gpt-box/gitHashes.json new file mode 100644 index 000000000000..4057674c0541 --- /dev/null +++ b/pkgs/by-name/gp/gpt-box/gitHashes.json @@ -0,0 +1,7 @@ +{ + "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=", + "fl_build": "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=", + "fl_lib": "sha256-GFgDSkAI5alBxngm8y8A5oXfWgyuleNjnM4bsgYUlSs=", + "flutter_highlight": "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw=", + "openai_dart": "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw=" +} diff --git a/pkgs/by-name/gp/gpt-box/package.nix b/pkgs/by-name/gp/gpt-box/package.nix index da5a0cf3dae0..1ff42ea9d5b5 100644 --- a/pkgs/by-name/gp/gpt-box/package.nix +++ b/pkgs/by-name/gp/gpt-box/package.nix @@ -6,33 +6,28 @@ copyDesktopItems, makeDesktopItem, runCommand, - yq, - gpt-box, + yq-go, _experimental-update-script-combinators, - gitUpdater, + nix-update-script, }: -flutter329.buildFlutterApplication rec { - pname = "gpt-box"; - version = "1.0.385"; +let + version = "1.0.395"; src = fetchFromGitHub { owner = "lollipopkit"; repo = "flutter_gpt_box"; tag = "v${version}"; - hash = "sha256-gl8kANxZLNXSuZxcK9WqfXxVWsCpZCbV+qmSt2ZnI6E="; + hash = "sha256-YtrsN8CdbCvbzfex8bCUUfqfTfyhhZfmweydaRSn1J4="; }; +in +flutter329.buildFlutterApplication { + pname = "gpt-box"; + inherit version src; pubspecLock = lib.importJSON ./pubspec.lock.json; - gitHashes = { - computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8="; - fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g="; - fl_lib = "sha256-gAZqxPOBMXfy0mHEd7Jud0QJwyRbqC4nIRDIA81TZxM="; - flutter_highlight = "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw="; - openai_dart = "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw="; - webdav_client = "sha256-aTkMcrXksHLEG4UpeE1MBmCKpX5l11+y/p4tICrOTGk="; - }; + gitHashes = lib.importJSON ./gitHashes.json; nativeBuildInputs = [ copyDesktopItems @@ -57,22 +52,31 @@ flutter329.buildFlutterApplication rec { ]; postInstall = '' - install -Dm0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png + install -D --mode=0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png ''; passthru = { pubspecSource = runCommand "pubspec.lock.json" { - nativeBuildInputs = [ yq ]; - inherit (gpt-box) src; + inherit src; + nativeBuildInputs = [ yq-go ]; } '' - cat $src/pubspec.lock | yq > $out + yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out" ''; updateScript = _experimental-update-script-combinators.sequence [ - (gitUpdater { rev-prefix = "v"; }) - (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json) + (nix-update-script { }) + ( + (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json) + // { + supportedFeatures = [ ]; + } + ) + { + command = [ ./update-gitHashes.py ]; + supportedFeatures = [ ]; + } ]; }; diff --git a/pkgs/by-name/gp/gpt-box/pubspec.lock.json b/pkgs/by-name/gp/gpt-box/pubspec.lock.json index a8439eea8bfd..a81fb020dc8a 100644 --- a/pkgs/by-name/gp/gpt-box/pubspec.lock.json +++ b/pkgs/by-name/gp/gpt-box/pubspec.lock.json @@ -1,15 +1,5 @@ { "packages": { - "_discoveryapis_commons": { - "dependency": "transitive", - "description": { - "name": "_discoveryapis_commons", - "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.7" - }, "_fe_analyzer_shared": { "dependency": "transitive", "description": { @@ -90,31 +80,31 @@ "dependency": "transitive", "description": { "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.7" }, "args": { "dependency": "transitive", "description": { "name": "args", - "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.0" + "version": "2.7.0" }, "asn1lib": { "dependency": "transitive", "description": { "name": "asn1lib", - "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c", + "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.9" + "version": "1.6.4" }, "async": { "dependency": "transitive", @@ -210,11 +200,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2", + "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.9.3" + "version": "8.9.5" }, "camera": { "dependency": "transitive", @@ -230,31 +220,31 @@ "dependency": "transitive", "description": { "name": "camera_android_camerax", - "sha256": "7cc6adf1868bdcf4e63a56b24b41692dfbad2bec1cdceea451c77798f6a605c3", + "sha256": "f0dcbce91623f75030840609de9b64d0d73f86df279c6e9588c1501245a05eb2", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.13" + "version": "0.6.15+2" }, "camera_avfoundation": { "dependency": "transitive", "description": { "name": "camera_avfoundation", - "sha256": "1eeb9ce7c9a397e312343fd7db337d95f35c3e65ad5a62ff637c8abce5102b98", + "sha256": "a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.18+8" + "version": "0.9.18+14" }, "camera_platform_interface": { "dependency": "transitive", "description": { "name": "camera_platform_interface", - "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31", + "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.9.0" + "version": "2.10.0" }, "camera_web": { "dependency": "transitive", @@ -306,16 +296,6 @@ "source": "hosted", "version": "2.3.2" }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.2" - }, "clock": { "dependency": "transitive", "description": { @@ -330,11 +310,11 @@ "dependency": "transitive", "description": { "name": "cloudflare_turnstile", - "sha256": "c7f37c7327d3f03b528a2334a5131c352ce62a545254e557693227a207801dc7", + "sha256": "d13cbec55a1c4916bca1d4dbd84fbe7b655ae35a264513750fdb8250486269e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.3.1" }, "code_builder": { "dependency": "transitive", @@ -367,16 +347,6 @@ "source": "git", "version": "3.2.1" }, - "console": { - "dependency": "transitive", - "description": { - "name": "console", - "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, "convert": { "dependency": "transitive", "description": { @@ -441,11 +411,11 @@ "dependency": "transitive", "description": { "name": "dio_web_adapter", - "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a", + "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.1.1" }, "encrypt": { "dependency": "transitive", @@ -471,21 +441,21 @@ "dependency": "direct main", "description": { "name": "extended_image", - "sha256": "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae", + "sha256": "f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.1.0" + "version": "10.0.1" }, "extended_image_library": { "dependency": "transitive", "description": { "name": "extended_image_library", - "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", + "sha256": "ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.6" + "version": "5.0.0" }, "fake_async": { "dependency": "transitive", @@ -497,26 +467,6 @@ "source": "hosted", "version": "1.3.2" }, - "fetch_api": { - "dependency": "transitive", - "description": { - "name": "fetch_api", - "sha256": "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "fetch_client": { - "dependency": "transitive", - "description": { - "name": "fetch_client", - "sha256": "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, "ffi": { "dependency": "transitive", "description": { @@ -541,11 +491,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810", + "sha256": "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.3.7" + "version": "9.2.3" }, "file_selector_linux": { "dependency": "transitive", @@ -612,8 +562,8 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "v1.0.244", - "resolved-ref": "5104bf4a32003ef76877555f58a2986c0646ead3", + "ref": "v1.0.268", + "resolved-ref": "88908c4e838b15e1bde5b2685ccd016b7578e8a4", "url": "https://github.com/lppcg/fl_lib" }, "source": "git", @@ -625,46 +575,6 @@ "source": "sdk", "version": "0.0.0" }, - "flutter_app_builder": { - "dependency": "transitive", - "description": { - "name": "flutter_app_builder", - "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.5" - }, - "flutter_app_packager": { - "dependency": "transitive", - "description": { - "name": "flutter_app_packager", - "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.5" - }, - "flutter_app_publisher": { - "dependency": "transitive", - "description": { - "name": "flutter_app_publisher", - "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.5" - }, - "flutter_distributor": { - "dependency": "direct dev", - "description": { - "name": "flutter_distributor", - "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.5" - }, "flutter_highlight": { "dependency": "direct main", "description": { @@ -776,11 +686,11 @@ "dependency": "transitive", "description": { "name": "flutter_markdown", - "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5", + "sha256": "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6+2" + "version": "0.7.7" }, "flutter_markdown_latex": { "dependency": "transitive", @@ -806,31 +716,41 @@ "dependency": "direct dev", "description": { "name": "flutter_native_splash", - "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7", + "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.4" + "version": "2.4.6" }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e", + "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.24" + "version": "2.0.28" + }, + "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", + "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.17" + "version": "2.1.0" }, "flutter_test": { "dependency": "direct dev", @@ -844,8 +764,18 @@ "source": "sdk", "version": "0.0.0" }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.7" + }, "freezed_annotation": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "freezed_annotation", "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2", @@ -864,16 +794,6 @@ "source": "hosted", "version": "4.0.0" }, - "get_it": { - "dependency": "transitive", - "description": { - "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.7.0" - }, "glob": { "dependency": "transitive", "description": { @@ -894,36 +814,6 @@ "source": "hosted", "version": "6.2.1" }, - "google_identity_services_web": { - "dependency": "transitive", - "description": { - "name": "google_identity_services_web", - "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.3" - }, - "googleapis": { - "dependency": "transitive", - "description": { - "name": "googleapis", - "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "13.2.0" - }, - "googleapis_auth": { - "dependency": "transitive", - "description": { - "name": "googleapis_auth", - "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.0" - }, "graphs": { "dependency": "transitive", "description": { @@ -988,11 +878,11 @@ "dependency": "direct main", "description": { "name": "html", - "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.15.5" + "version": "0.15.6" }, "http": { "dependency": "transitive", @@ -1058,11 +948,11 @@ "dependency": "direct main", "description": { "name": "image", - "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.5.4" }, "image_picker": { "dependency": "direct main", @@ -1078,11 +968,11 @@ "dependency": "transitive", "description": { "name": "image_picker_android", - "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a", + "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.12+21" + "version": "0.8.12+23" }, "image_picker_for_web": { "dependency": "transitive", @@ -1108,11 +998,11 @@ "dependency": "transitive", "description": { "name": "image_picker_linux", - "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa", + "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1+1" + "version": "0.2.1+2" }, "image_picker_macos": { "dependency": "transitive", @@ -1234,16 +1124,6 @@ "source": "hosted", "version": "5.1.1" }, - "liquid_engine": { - "dependency": "transitive", - "description": { - "name": "liquid_engine", - "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.2" - }, "local_auth": { "dependency": "transitive", "description": { @@ -1258,11 +1138,11 @@ "dependency": "transitive", "description": { "name": "local_auth_android", - "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92", + "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.46" + "version": "1.0.49" }, "local_auth_darwin": { "dependency": "transitive", @@ -1374,26 +1254,6 @@ "source": "hosted", "version": "2.0.0" }, - "msix": { - "dependency": "transitive", - "description": { - "name": "msix", - "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.16.8" - }, - "mustache_template": { - "dependency": "transitive", - "description": { - "name": "mustache_template", - "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, "nested": { "dependency": "transitive", "description": { @@ -1407,32 +1267,23 @@ "openai_dart": { "dependency": "direct main", "description": { - "name": "openai_dart", - "sha256": "1cc5ed0915fa7572b943de01cfa7a3e5cfe1e6a7f4d0d9a9374d046518e84575", - "url": "https://pub.dev" + "path": "packages/openai_dart", + "ref": "v1.0.744", + "resolved-ref": "ceb38486df0a49fddb4cb5a3283e566d4462f8ac", + "url": "https://github.com/lollipopkit/langchain_dart" }, - "source": "hosted", + "source": "git", "version": "0.4.5" }, "package_config": { "dependency": "transitive", "description": { "name": "package_config", - "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" - }, - "parse_app_package": { - "dependency": "transitive", - "description": { - "name": "parse_app_package", - "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.5" + "version": "2.2.0" }, "path": { "dependency": "transitive", @@ -1468,11 +1319,11 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2", + "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.15" + "version": "2.2.17" }, "path_provider_foundation": { "dependency": "transitive", @@ -1534,16 +1385,6 @@ "source": "hosted", "version": "3.1.6" }, - "plist_parser": { - "dependency": "transitive", - "description": { - "name": "plist_parser", - "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.11" - }, "plugin_platform_interface": { "dependency": "transitive", "description": { @@ -1574,35 +1415,45 @@ "source": "hosted", "version": "1.5.1" }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, "pretty_qr_code": { "dependency": "transitive", "description": { "name": "pretty_qr_code", - "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5", + "sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.0" + "version": "3.4.0" }, "provider": { "dependency": "transitive", "description": { "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", + "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.2" + "version": "6.1.4" }, "pub_semver": { "dependency": "transitive", "description": { "name": "pub_semver", - "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "pubspec_parse": { "dependency": "transitive", @@ -1614,16 +1465,6 @@ "source": "hosted", "version": "1.5.0" }, - "qiniu_sdk_base": { - "dependency": "transitive", - "description": { - "name": "qiniu_sdk_base", - "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.2" - }, "qr": { "dependency": "transitive", "description": { @@ -1644,15 +1485,25 @@ "source": "hosted", "version": "0.9.11" }, - "recase": { + "riverpod": { "dependency": "transitive", "description": { - "name": "recase", - "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "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", @@ -1738,21 +1589,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences", - "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.2" + "version": "2.5.3" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22", + "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.6" + "version": "2.4.10" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1824,26 +1675,6 @@ "source": "hosted", "version": "3.0.0" }, - "shell_executor": { - "dependency": "transitive", - "description": { - "name": "shell_executor", - "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.6" - }, - "shell_uikit": { - "dependency": "transitive", - "description": { - "name": "shell_uikit", - "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, "shortid": { "dependency": "direct main", "description": { @@ -1890,6 +1721,16 @@ "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": { @@ -1900,6 +1741,16 @@ "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": { @@ -2004,21 +1855,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193", + "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.14" + "version": "6.3.16" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", + "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.2" + "version": "6.3.3" }, "url_launcher_linux": { "dependency": "transitive", @@ -2054,11 +1905,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.0" + "version": "2.4.1" }, "url_launcher_windows": { "dependency": "transitive", @@ -2074,11 +1925,11 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313", + "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.7" + "version": "4.5.1" }, "vector_graphics": { "dependency": "transitive", @@ -2144,52 +1995,51 @@ "dependency": "transitive", "description": { "name": "web", - "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.0" + "version": "1.1.1" }, "web_socket": { "dependency": "transitive", "description": { "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", + "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.1.6" + "version": "1.0.0" }, "web_socket_channel": { "dependency": "transitive", "description": { "name": "web_socket_channel", - "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.2" + "version": "3.0.3" }, - "webdav_client": { + "webdav_client_plus": { "dependency": "direct main", "description": { - "path": ".", - "ref": "v1.0.66", - "resolved-ref": "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674", - "url": "https://github.com/lollipopkit/webdav_client" + "name": "webdav_client_plus", + "sha256": "0f992fe05a46674a800d9fd8fdc5c54952ff739da155c558776a62ca0c2bed3a", + "url": "https://pub.dev" }, - "source": "git", - "version": "1.2.2" + "source": "hosted", + "version": "1.0.2" }, "win32": { "dependency": "transitive", "description": { "name": "win32", - "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef", + "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.11.0" + "version": "5.12.0" }, "window_manager": { "dependency": "transitive", @@ -2244,6 +2094,6 @@ }, "sdks": { "dart": ">=3.7.0 <4.0.0", - "flutter": ">=3.27.0" + "flutter": ">=3.29.0" } } diff --git a/pkgs/by-name/gp/gpt-box/update-gitHashes.py b/pkgs/by-name/gp/gpt-box/update-gitHashes.py new file mode 100755 index 000000000000..ffa6feb66653 --- /dev/null +++ b/pkgs/by-name/gp/gpt-box/update-gitHashes.py @@ -0,0 +1,51 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python3 -p python3 nix-prefetch-git + +import json +import subprocess +import sys +from pathlib import Path + +THIS_FOLDER = Path(__file__).parent.resolve() +PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json" +GIT_HASHES = THIS_FOLDER / "gitHashes.json" + + +def fetch_git_hash(url: str, rev: str) -> str: + result = subprocess.run( + ["nix-prefetch-git", "--url", url, "--rev", rev], + capture_output=True, + text=True, + check=True, + ) + return json.loads(result.stdout)["hash"] + + +def main() -> None: + if not PUBSPEC_LOCK.exists(): + sys.exit(1) + try: + data = json.loads(PUBSPEC_LOCK.read_text()) + except json.JSONDecodeError: + sys.exit(1) + output: dict[str, str] = {} + for name, info in data.get("packages", {}).items(): + if info.get("source") != "git": + continue + desc = info.get("description") + if not isinstance(desc, dict): + continue + url = desc.get("url") + rev = desc.get("resolved-ref") + if not (isinstance(url, str) and isinstance(rev, str)): + continue + try: + package_hash = fetch_git_hash(url, rev) + except subprocess.CalledProcessError: + continue + output[name] = package_hash + GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n") + + +if __name__ == "__main__": + main() From 5dc30db6f495b03c46148074948b0e929384f777 Mon Sep 17 00:00:00 2001 From: Sam <30577766+Samasaur1@users.noreply.github.com> Date: Mon, 29 Sep 2025 13:15:35 -0700 Subject: [PATCH 02/22] xcodegen: 2.42.0 -> 2.44.1 --- pkgs/by-name/xc/xcodegen/nix/default.nix | 4 ++-- pkgs/by-name/xc/xcodegen/nix/workspace-state.json | 8 ++++---- pkgs/by-name/xc/xcodegen/package.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/xc/xcodegen/nix/default.nix b/pkgs/by-name/xc/xcodegen/nix/default.nix index e9d58741591f..10ffd303aaf4 100644 --- a/pkgs/by-name/xc/xcodegen/nix/default.nix +++ b/pkgs/by-name/xc/xcodegen/nix/default.nix @@ -2,7 +2,7 @@ { workspaceStateFile = ./workspace-state.json; hashes = { - "AEXML" = "sha256-bQcXq1aS76sOjW8yYCOlGVZ2tStDvzRQSyj9VrAj6nI="; + "AEXML" = "sha256-6KvO8zT667Td+4qOeYzHbd51hDzFJFrxcVyYr2h5igc="; "ArtifactBundleGen" = "sha256-mSXJiRGFIm2RtzBG8l6s4RJ2BzSbPZKUZIqWM4vDIhc="; "JSONUtilities" = "sha256-jl8XfgoB5IX0qwwDtzcWgK0u3SNG2HfrPoEb2a6/mlA="; "PathKit" = "sha256-ewxTC1kpu6PXhwamCxYfI50ooYO1SIU0+IXH2tc/uv4="; @@ -10,7 +10,7 @@ "Spectre" = "sha256-fipGRIgw+jV7Wrxa+xivRk7YMyxDhGFB6SHIHscrmV8="; "SwiftCLI" = "sha256-PmjzLss0D12iy6YKsudFa8i63NQAssyCBqqq8VjRiH4="; "Version" = "sha256-4IwQlexWtIH9M0sSai1a+ITTAKkD2zJtbYoV4Cg+Snw="; - "XcodeProj" = "sha256-ycHDzay37YtT/3QqUpG6XPjRh32P5iU/I5GpfjrXs/I="; + "XcodeProj" = "sha256-UMnSV/kdRlUxp23Rd70xCHzJeP6Vh1viyHNERo3haRE="; "Yams" = "sha256-5qxuCkmopm3uFcoYJKQA8ofW98f53H1gZaPiOh2DS4U="; }; } diff --git a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json index 0f95461da6e0..ab48b77ec269 100644 --- a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json +++ b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json @@ -12,8 +12,8 @@ }, "state": { "checkoutState": { - "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3", - "version": "4.6.1" + "revision": "db806756c989760b35108146381535aec231092b", + "version": "4.7.0" }, "name": "sourceControlCheckout" }, @@ -148,8 +148,8 @@ }, "state": { "checkoutState": { - "revision": "447c159b0c5fb047a024fd8d942d4a76cf47dde0", - "version": "8.16.0" + "revision": "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4", + "version": "8.27.7" }, "name": "sourceControlCheckout" }, diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix index 24dda3eb9c97..17ace827e11b 100644 --- a/pkgs/by-name/xc/xcodegen/package.nix +++ b/pkgs/by-name/xc/xcodegen/package.nix @@ -16,13 +16,13 @@ in swiftPackages.stdenv.mkDerivation (finalAttrs: { pname = "xcodegen"; - version = "2.42.0"; + version = "2.44.1"; src = fetchFromGitHub { owner = "yonaskolb"; repo = "XcodeGen"; tag = finalAttrs.version; - hash = "sha256-wcjmADG+XnS2kR8BHe6ijApomucS9Tx7ZRjWZmTCUiI="; + hash = "sha256-RQlmQfmrLZRrgIA09fE84JuqmYkkrz4KSw2dvYXw0Rs="; }; # Including SwiftPM as a nativeBuildInput provides a buildPhase for you. From 908590149f5fdd558a608412a94519f4cd7b5212 Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Tue, 14 Oct 2025 02:40:59 +0200 Subject: [PATCH 03/22] binaryninja-free: 5.1.8005 -> 5.1.8104 --- pkgs/by-name/bi/binaryninja-free/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix index 2dc8abf92679..bfe4d355766d 100644 --- a/pkgs/by-name/bi/binaryninja-free/package.nix +++ b/pkgs/by-name/bi/binaryninja-free/package.nix @@ -20,11 +20,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "binaryninja-free"; - version = "5.1.8005"; + version = "5.1.8104"; src = fetchurl { url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip"; - hash = "sha256-vXR0TXcQwEoYz1qiGO3TYajUt+QR9wfV0es6yTZvYLs="; + hash = "sha256-s7lRvQhegW/bgZc6XnAowTl1ZZPIN0/BJe+u3p9qHsE="; }; icon = fetchurl { From 631a9ddbab434c6576b32a341604bce95885432a Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sat, 25 Oct 2025 14:23:37 -0400 Subject: [PATCH 04/22] mongodb-7_0: 7.0.24 -> 7.0.25 Fixes: CVE-2025-11979 --- pkgs/servers/nosql/mongodb/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix index 2009607e8421..17f3be0cd410 100644 --- a/pkgs/servers/nosql/mongodb/7.0.nix +++ b/pkgs/servers/nosql/mongodb/7.0.nix @@ -21,8 +21,8 @@ let in buildMongoDB { inherit avxSupport; - version = "7.0.24"; - sha256 = "sha256-ANPg60OAxwwq1FhRTMOQ0dHBOuKpob1sXnAZMJWhtds="; + version = "7.0.25"; + sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks="; patches = [ # ModuleNotFoundError: No module named 'mongo_tooling_metrics': # NameError: name 'SConsToolingMetrics' is not defined: From 5e75ea03bc85db222848d236d0b39e5971cdc51c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 Oct 2025 23:31:17 +0000 Subject: [PATCH 05/22] python3Packages.numexpr: 2.11.0 -> 2.14.1 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index 2c6a4c3de606..48ec1179cc67 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.11.0"; + version = "2.14.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dbLAGk7aLnw1e8Z6P1w912UGwVtf1NxChF7y4YIYG60="; + hash = "sha256-S+ALEIbHt6XDLjFVgSK3uAJD/gmFebFwln2oPzFStIs="; }; build-system = [ From 9258dea3a9c0c1608bcd442770685c3c1162c831 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 26 Oct 2025 10:52:56 +0100 Subject: [PATCH 06/22] git-cola: 4.15.0 -> 4.16.0 https://github.com/git-cola/git-cola/releases/tag/v4.16.0 --- pkgs/by-name/gi/git-cola/package.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix index 0db36da8e687..7e134ceb6fbc 100644 --- a/pkgs/by-name/gi/git-cola/package.nix +++ b/pkgs/by-name/gi/git-cola/package.nix @@ -5,7 +5,7 @@ python3Packages, gettext, git, - qt5, + qt6, versionCheckHook, copyDesktopItems, imagemagick, @@ -14,33 +14,36 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.15.0"; + version = "4.16.0"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; tag = "v${version}"; - hash = "sha256-h3W7CsdJK1hid8Nmp1bvFwiHVS4UV/gziwtyZuxSxHY="; + hash = "sha256-gBqMwqmpu0+gMeffiFdwy/kBdCUQRpJr+3vzUkBCRSk="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; + build-system = with python3Packages; [ + setuptools-scm + ]; - propagatedBuildInputs = [ + buildInputs = [ git + qt6.qtbase ] - ++ (with python3Packages; [ - setuptools - pyqt5 + ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; + + dependencies = with python3Packages; [ + polib + pyqt6 qtpy send2trash - polib - ]); + ]; nativeBuildInputs = [ gettext - qt5.wrapQtAppsHook - python3Packages.setuptools-scm + qt6.wrapQtAppsHook imagemagick ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ]; From 355bee82de932f69da3e01eeccb35e3cd3892b08 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 29 Sep 2025 02:08:13 +0800 Subject: [PATCH 07/22] atlassian-cli: rename to appfire-cli --- pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/package.nix | 2 +- pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/wrapper.sh | 0 pkgs/top-level/aliases.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/package.nix (97%) rename pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/wrapper.sh (100%) diff --git a/pkgs/by-name/at/atlassian-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix similarity index 97% rename from pkgs/by-name/at/atlassian-cli/package.nix rename to pkgs/by-name/ap/appfire-cli/package.nix index 3e1d1ddcc3e3..aee338267f91 100644 --- a/pkgs/by-name/at/atlassian-cli/package.nix +++ b/pkgs/by-name/ap/appfire-cli/package.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation rec { - pname = "atlassian-cli"; + pname = "appfire-cli"; version = "9.6.0"; src = fetchzip { diff --git a/pkgs/by-name/at/atlassian-cli/wrapper.sh b/pkgs/by-name/ap/appfire-cli/wrapper.sh similarity index 100% rename from pkgs/by-name/at/atlassian-cli/wrapper.sh rename to pkgs/by-name/ap/appfire-cli/wrapper.sh diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c43b9d8748f9..a6c2644a0639 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -305,6 +305,7 @@ mapAliases { aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27 asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27 asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19 + atlassian-cli = appfire-cli; # Added 2025-09-29 ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17 AusweisApp2 = throw "'AusweisApp2' has been renamed to/replaced by 'ausweisapp'"; # Converted to throw 2025-10-27 autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21 From be124e69296df5c6aa7059af48f4bc5ef37a1aa3 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Mon, 29 Sep 2025 02:29:59 +0800 Subject: [PATCH 08/22] appfire-cli: refactor; 9.6.0 -> 12.1.0 --- pkgs/by-name/ap/appfire-cli/package.nix | 105 ++++++++++++++++-------- pkgs/by-name/ap/appfire-cli/wrapper.sh | 20 ----- 2 files changed, 69 insertions(+), 56 deletions(-) delete mode 100755 pkgs/by-name/ap/appfire-cli/wrapper.sh diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix index aee338267f91..a4519d548f3d 100644 --- a/pkgs/by-name/ap/appfire-cli/package.nix +++ b/pkgs/by-name/ap/appfire-cli/package.nix @@ -2,53 +2,86 @@ lib, stdenv, fetchzip, + makeBinaryWrapper, + coreutils, + findutils, jre, + + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "appfire-cli"; - version = "9.6.0"; + version = "12.1.0"; src = fetchzip { - url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "sha256-55ydhprVC9NdDMUrKbpSAEQBb9zRYgwOc7k8aP4R89A="; + url = "https://appfire.atlassian.net/wiki/download/attachments/60562669/acli-${finalAttrs.version}-distribution.zip"; + hash = "sha256-6p8i5ec8IAygACdsdzP8g5u24mQZ7Ci684xuu/kAADo="; }; - tools = [ - "agile" - "bamboo" - "bitbucket" - "confluence" - "csv" - "hipchat" - "jira" - "servicedesk" - "structure" - "tempo" - "trello" - "upm" - ]; + nativeBuildInputs = [ makeBinaryWrapper ]; installPhase = '' - mkdir -p $out/{bin,share/doc/atlassian-cli} - cp -r lib $out/share/java - cp -r README.txt license $out/share/doc/atlassian-cli - for tool in $tools - do - substitute ${./wrapper.sh} $out/bin/$tool \ - --subst-var out \ - --subst-var-by jre ${jre} \ - --subst-var-by tool $tool - chmod +x $out/bin/$tool - done + runHook preInstall + + mkdir -p $out/share/{,doc/}appfire-cli + cp -r acli.sh lib $out/share/appfire-cli + cp -r README.txt license $out/share/doc/appfire-cli + + ACLI_SHELL=${finalAttrs.passthru.shellNames.${stdenv.hostPlatform.system} or "unsupport"} + if test -f $ACLI_SHELL; then + install -Dm755 $ACLI_SHELL $out/share/appfire-cli/$ACLI_SHELL + fi + + substituteInPlace $out/share/appfire-cli/acli.sh \ + --replace-fail 'java $' '${lib.getExe jre} $' \ + --replace-fail '(find' '(${lib.getExe findutils}' \ + --replace-fail dirname ${lib.getExe' coreutils "dirname"} \ + --replace-fail uname ${lib.getExe' coreutils "uname"} + makeBinaryWrapper $out/share/appfire-cli/acli.sh $out/bin/acli + + runHook postInstall ''; - meta = with lib; { - description = "Integrated family of CLI’s for various Atlassian applications"; - homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; - license = licenses.unfreeRedistributable; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ twey ]; + passthru = { + shellNames = { + "x86_64-linux" = "bin/shell-linux-amd64"; + "aarch64-linux" = "bin/shell-linux-arm64"; + "x86_64-darwin" = "bin/shell-macos-amd64"; + "aarch64-darwin" = "bin/shell-macos-arm64"; + }; + # versionCheckHook cannot be used because appfire-cli requires $HOME to be set + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "acli -a getClientInfo"; + }; + }; + + meta = { + description = "Integrated family of CLIs for Atlassian, Atlassian-related, and other applications"; + longDescription = '' + Appfire CLI (ACLI) is an integrated family of CLIs for Atlassian, + Atlassian-related, and other applications. + + ACLI provides a consistent and reliable automation platform that allows + users, administrators, script writers, and DevOps developers to perform + tasks, implement business processes, or apply general automation with + Atlassian products. + + The CLIs are built on the Atlassian remote APIs and deliver a higher + level, client-based API that is easier to use and more powerful than + the underlying product APIs. + + The upstream documentation describes configuring acli by placing + {file}`acli.properties` in the same directory as {file}`acli.sh`. + Since the /nix/store is not writable, you can instead place the file + at {file}`$HOME/acli.properties` to achieve the same effect. + ''; + homepage = "https://apps.appf.re/acli"; + license = lib.licenses.unfreeRedistributable; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + maintainers = with lib.maintainers; [ twey ]; + mainProgram = "acli"; inherit (jre.meta) platforms; }; -} +}) diff --git a/pkgs/by-name/ap/appfire-cli/wrapper.sh b/pkgs/by-name/ap/appfire-cli/wrapper.sh deleted file mode 100755 index 80b60dbc468c..000000000000 --- a/pkgs/by-name/ap/appfire-cli/wrapper.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -tool=@tool@ -user=ATLASSIAN_${tool^^}_USER -host=ATLASSIAN_${tool^^}_HOST -pass=ATLASSIAN_${tool^^}_PASS - -[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli -if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ] -then - >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli' - exit 1 -fi - -@jre@/bin/java \ - -jar @out@/share/java/@tool@-cli-* \ - --server "${!host}" \ - --user "${!user}" \ - --password "${!pass}" \ - "$@" From 9c9af80c0ea8e66687645abf16fc47ad25e9f09f Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 31 Oct 2025 09:26:35 +0100 Subject: [PATCH 09/22] wash-cli: 0.39.0 -> 1.0.0-beta.10 https://github.com/wasmCloud/wash/releases/tag/wash-v1.0.0-beta.10 --- pkgs/by-name/wa/wash-cli/package.nix | 60 ++++++++++------------------ 1 file changed, 22 insertions(+), 38 deletions(-) diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix index 89375f733618..ca0455f62d50 100644 --- a/pkgs/by-name/wa/wash-cli/package.nix +++ b/pkgs/by-name/wa/wash-cli/package.nix @@ -1,51 +1,35 @@ { lib, - fetchCrate, + fetchFromGitHub, rustPlatform, - pkg-config, - openssl, - fetchurl, }: -let - wasiPreviewCommandComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.command.wasm"; - hash = "sha256-UVBFddlI0Yh1ZNs0b2jSnKsHvGGAS5U09yuwm8Q6lxw="; - }; - wasiPreviewReactorComponentAdapter = fetchurl { - url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.reactor.wasm"; - hash = "sha256-oE53IRMZgysSWT7RhrpZJjdaIyzCRf0h4d1yjqj/PSk="; - }; - -in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "wash-cli"; - version = "0.39.0"; + version = "1.0.0-beta.10"; - src = fetchCrate { - inherit version pname; - hash = "sha256-qOxYBhwkcn4g1cUBHuF0AoecpxN4ukgTjBnzVhWtw7A="; + src = fetchFromGitHub { + owner = "wasmCloud"; + repo = "wash"; + tag = "wash-v${finalAttrs.version}"; + hash = "sha256-g1OXyxLSKicMz0mnTyHNmihtt5WMx91bNo83NhZpx9s="; }; - cargoHash = "sha256-dPHzRZh5jBxbPt+1a9wVbsBclAkfrcAXhpZgTw7e4Qo="; + cargoHash = "sha256-/Dah1F3pJBqtrCw7iVRGidQUl8rmD31Eoqva9ejc1iw="; - nativeBuildInputs = [ pkg-config ]; + checkFlags = [ + # Requires internet access + "--skip=test_end_to_end_template_to_execution" + "--skip=test_plugin_test_inspect_comprehensive" + "--skip=test_pull_and_validate_ghcr_component" + ]; - buildInputs = [ openssl ]; - - preBuild = " - export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter} - export WASI_PREVIEW1_REACTOR_COMPONENT_ADAPTER=${wasiPreviewReactorComponentAdapter} - "; - - # Tests require the internet and don't work when running in nix - doCheck = false; - - meta = with lib; { - description = "wasmCloud Shell (wash) CLI tool"; - homepage = "https://wasmcloud.com/"; + meta = { + description = "Command-line tool for developing, building, and managing WebAssembly components"; + homepage = "https://github.com/wasmCloud/wash"; + changelog = "https://github.com/wasmCloud/wash/releases/tag/wash-v${finalAttrs.version}"; mainProgram = "wash"; - license = licenses.asl20; - maintainers = with maintainers; [ bloveless ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ bloveless ]; }; -} +}) From 81b863527d0013114566253df5462cb58ebe3e4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Oct 2025 12:33:04 +0000 Subject: [PATCH 10/22] opensmtpd: 7.7.0p0 -> 7.8.0p0 --- pkgs/by-name/op/opensmtpd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opensmtpd/package.nix b/pkgs/by-name/op/opensmtpd/package.nix index 8f7930623b37..3304486a8919 100644 --- a/pkgs/by-name/op/opensmtpd/package.nix +++ b/pkgs/by-name/op/opensmtpd/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "7.7.0p0"; + version = "7.8.0p0"; nativeBuildInputs = [ autoreconfHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - hash = "sha256-sJU9oc4sv+S+E5zbGaqTX7+rQs8KmT1CWzejl9xIOWg="; + hash = "sha256-QDTeLpLGH6g+7a2x2Ni9/mXlfrUM6WeeAUCVDjTKSrc="; }; patches = [ From 2c40a3091b1e2c1ceae3396142ea68274675691b Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sat, 9 Aug 2025 19:27:45 +0200 Subject: [PATCH 11/22] mtkclient: init at 2.0.1-unstable-2025-09-26 Co-authored-by: Dom Rodriguez --- pkgs/by-name/mt/mtkclient/package.nix | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/mt/mtkclient/package.nix diff --git a/pkgs/by-name/mt/mtkclient/package.nix b/pkgs/by-name/mt/mtkclient/package.nix new file mode 100644 index 000000000000..8424253da942 --- /dev/null +++ b/pkgs/by-name/mt/mtkclient/package.nix @@ -0,0 +1,50 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication { + pname = "mtkclient"; + version = "2.0.1-unstable-2025-09-26"; + pyproject = true; + + src = fetchFromGitHub { + owner = "bkerler"; + repo = "mtkclient"; + rev = "399b3a1c25e73ddf4951f12efd20f7254ee04a39"; + hash = "sha256-XNPYeVhp5P+zQdumS9IzlUd5+WebL56qcgs10WS2/LY="; + }; + + build-system = [ python3Packages.hatchling ]; + + dependencies = with python3Packages; [ + colorama + fusepy + pycryptodome + pycryptodomex + pyserial + pyside6 + pyusb + shiboken6 + ]; + + pythonImportsCheck = [ "mtkclient" ]; + + # Note: No need to install mtkclient udev rules, 50-android.rules is covered by + # systemd 258 or newer and 51-edl.rules only applies to Qualcomm (i.e. not MTK). + + meta = { + description = "MTK reverse engineering and flash tool"; + homepage = "https://github.com/bkerler/mtkclient"; + mainProgram = "mtk"; + license = lib.licenses.gpl3; + sourceProvenance = with lib.sourceTypes; [ + # loaders, preloaders and exploit payloads + binaryFirmware + # everything else + fromSource + ]; + maintainers = [ lib.maintainers.timschumi ]; + }; +} From 81cf80a2a5ccbe7f284381330da4fcd30ef0eba5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 31 Oct 2025 22:20:33 +0000 Subject: [PATCH 12/22] diffoscope: 306 -> 307 Changes: https://lists.reproducible-builds.org/pipermail/diffoscope/2025-October/002867.html --- pkgs/by-name/di/diffoscope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index dee2dc5008af..7df82ec5f70d 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -106,12 +106,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "306"; + version = "307"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-Yr4xynjR5N7aImb8VVLsiUE+OoKOoneDUbw9O7b77b8="; + hash = "sha256-ccMBoupgrDwbKaWAQa+Tqo6WfB5Qsva17uvpg2UX4jY="; }; outputs = [ From 175843d50547a2078291cd51a2ff499a3ad83e9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 Oct 2025 22:33:49 +0000 Subject: [PATCH 13/22] phpExtensions.xdebug: 3.4.6 -> 3.4.7 --- pkgs/development/php-packages/xdebug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 56af7dd6bf5a..3f4a75990c44 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -5,7 +5,7 @@ }: let - version = "3.4.6"; + version = "3.4.7"; in buildPecl { inherit version; @@ -16,7 +16,7 @@ buildPecl { owner = "xdebug"; repo = "xdebug"; rev = version; - hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c="; + hash = "sha256-TxwEyXyUGq3rUWyLExyDopJZ29eAoh9QG1TC2+hImmc="; }; doCheck = true; From 1de239c03bef056657e1ec6b5fe2fe0a99c94cba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 07:09:23 +0000 Subject: [PATCH 14/22] bitwarden-directory-connector: 2025.9.0 -> 2025.10.0 --- .../security/bitwarden-directory-connector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix index 77b03e236090..a5680ad34a8c 100644 --- a/pkgs/tools/security/bitwarden-directory-connector/default.nix +++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix @@ -19,14 +19,14 @@ let }: buildNpmPackage rec { pname = name; - version = "2025.9.0"; + version = "2025.10.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "bitwarden"; repo = "directory-connector"; rev = "v${version}"; - hash = "sha256-owzOgaYSbtsnZ0AvSWWFdSx96agJyBUM2steGIeg2E4="; + hash = "sha256-QzXZN1YWpWCila2wuSyzzuugW4W6UVkJNQM9xQr1Og0="; }; postPatch = '' @@ -38,7 +38,7 @@ let --replace-fail "AppImage" "dir" ''; - npmDepsHash = "sha256-brO+GGwdZyCDYycur5QnLKCcFZc1J2pM+vQPLtjUD/I="; + npmDepsHash = "sha256-VgzQGfP13n9Zl/7V5g2KWFLa9J15rUhY3wx5E5CWMi0="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; From 2aa2a574d2561fdfaabc07236cb89e1ddc8abaef Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 1 Nov 2025 13:31:59 +0000 Subject: [PATCH 15/22] python3Packages.tables: add patch for numexpr 2.13.0+ compatibility --- pkgs/development/python-modules/tables/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index 0357ae53d639..62321f1d9385 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchPypi, + fetchpatch, buildPythonPackage, pythonOlder, blosc2, @@ -34,6 +35,15 @@ buildPythonPackage rec { hash = "sha256-JUSBKnGG+tuoMdbdNOtJzNeI1qg/TkwrQxuDW2eWyRA="; }; + patches = [ + # should be included in next release + (fetchpatch { + name = "numexpr-2.13.0-compat.patch"; + url = "https://github.com/PyTables/PyTables/commit/41270019ce1ffd97ce8f23b21d635e00e12b0ccb.patch"; + hash = "sha256-CaDBYKiABVtlM5e9ChCsf8dWOwEnMPOIXQ100JTnlnE="; + }) + ]; + build-system = [ blosc2 cython From 28d9cf4c1e00b6c6feabfbb23b928af30e07c593 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 14:57:49 +0000 Subject: [PATCH 16/22] artisan: 3.2.0 -> 3.4.0 --- pkgs/by-name/ar/artisan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix index a0366a98acb4..e4a7a3925245 100644 --- a/pkgs/by-name/ar/artisan/package.nix +++ b/pkgs/by-name/ar/artisan/package.nix @@ -6,11 +6,11 @@ }: let pname = "artisan"; - version = "3.2.0"; + version = "3.4.0"; src = fetchurl { url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage"; - hash = "sha256-p8M9Z0z/0unJPOLXVOnN8INO4v0D5Ojjug42xT77oqQ="; + hash = "sha256-aAxFfghEf+MRDZBd0FD5OphOOVhz3Nt2wUOmhrwXGh4="; }; appimageContents = appimageTools.extract { From 3a6cce61c9602a101c9eea95267d1548ed592cde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 17:16:04 +0000 Subject: [PATCH 17/22] faugus-launcher: 1.9.6 -> 1.9.9 --- pkgs/by-name/fa/faugus-launcher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 90c77d359724..60a97b2d1c24 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "faugus-launcher"; - version = "1.9.6"; + version = "1.9.9"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = version; - hash = "sha256-7brHeRwrH6MbRcGCb5qufU1PHLgg5fCfgLhvdCQr+ak="; + hash = "sha256-4ySI6j74DmeHAKtIYuAp+dnmyz9/gc6cQomcfP6V5IM="; }; nativeBuildInputs = [ From 436876e07079d6cc604c1177ff328d164c77bad2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Nov 2025 19:44:30 +0100 Subject: [PATCH 18/22] workflows/pull-request-target: increase retries for prepare step We still get plenty of errors in the prepare step for the diff requests to take way too long - let's increase the number of retries massively now. These are repeated with exponential backoff, so hopefully they will succeed with some cooldown, when GitHub had time to compute the right diff in the background. --- .github/workflows/pull-request-target.yml | 2 +- .github/workflows/test.yml | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index d73f6fdc7e5c..76a77c7942e5 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -45,7 +45,7 @@ jobs: - id: prepare uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 with: - retries: 3 + retries: 10 # The default for this includes code 422, which happens regularly for us when comparing commits: # 422 - Server Error: Sorry, this diff is taking too long to generate. # Listing all other values from here to effectively remove 422: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c0451a54754..b9369de2af3d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,12 @@ jobs: - id: prepare uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 with: - retries: 3 + retries: 10 + # The default for this includes code 422, which happens regularly for us when comparing commits: + # 422 - Server Error: Sorry, this diff is taking too long to generate. + # Listing all other values from here to effectively remove 422: + # https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14 + retry-exempt-status-codes: 400,401,403,404 script: | require('./ci/github-script/prepare.js')({ github, From 02cd57c97af37620d10442241e666e123ab606eb Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sat, 1 Nov 2025 12:15:48 -0700 Subject: [PATCH 19/22] Revert "python3Packages.pycrdt-websocket: 0.15.5 -> 0.16.0" This reverts commit bed1841135644d3021abe2b2af2b924b34f748b5. --- .../python-modules/pycrdt-websocket/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix index 573c4917bbc5..7a3a2362de00 100644 --- a/pkgs/development/python-modules/pycrdt-websocket/default.nix +++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { pname = "pycrdt-websocket"; - version = "0.16.0"; + version = "0.15.5"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt-websocket"; - tag = version; - hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0="; + tag = "v${version}"; + hash = "sha256-piNd85X5YsTAOC9frYQRDyb/DPfzZicIPJ+bEVzgOsU="; }; build-system = [ hatchling ]; @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = { description = "WebSocket Connector for pycrdt"; homepage = "https://github.com/jupyter-server/pycrdt-websocket"; - changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md"; license = lib.licenses.mit; teams = [ lib.teams.jupyter ]; }; From 585ade0863d2bbfcae234c16761d72e347112c2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Nov 2025 19:28:17 +0000 Subject: [PATCH 20/22] kubexporter: 0.7.0 -> 0.7.1 --- pkgs/by-name/ku/kubexporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix index caa5061347e7..934b843ec25c 100644 --- a/pkgs/by-name/ku/kubexporter/package.nix +++ b/pkgs/by-name/ku/kubexporter/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubexporter"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "bakito"; repo = "kubexporter"; tag = "v${version}"; - hash = "sha256-QdMA/wehzESEkzBEzM1hIlIOzi2G/5QdMG+KlzGtiiU="; + hash = "sha256-cSYUR6EfRMLyPNaKDBbwWzpSy7/Gxe9UtnCz+cWHwrw="; }; - vendorHash = "sha256-pWmcLjZxGoUkOTrvxxmKBU/GjhMj3LVPJ9menAqFICk="; + vendorHash = "sha256-gPjfjOOh2HZaAaZt2FIb/Zy3xYKUNxC9+30TudfnDFQ="; ldflags = [ "-s" From f516853cf76530726d64556c6041212eedac996c Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 22:14:53 +0100 Subject: [PATCH 21/22] sdl-jstest: disable SDL1 build Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl-jstest/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix index 57e47ca9ef61..b1cb7a1c09d0 100644 --- a/pkgs/by-name/sd/sdl-jstest/package.nix +++ b/pkgs/by-name/sd/sdl-jstest/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, pkg-config, - SDL, SDL2, ncurses, docbook_xsl, @@ -24,10 +23,10 @@ stdenv.mkDerivation { }; buildInputs = [ - SDL SDL2 ncurses ]; + nativeBuildInputs = [ cmake pkg-config @@ -35,11 +34,14 @@ stdenv.mkDerivation { git ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ]; + meta = with lib; { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ ]; + mainProgram = "sdl2-jstest"; }; } From 788250ba78d1bc35c839c7ba26c1523dec860b08 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sat, 1 Nov 2025 22:17:33 +0100 Subject: [PATCH 22/22] sdl-jstest: modernize Signed-off-by: Marcin Serwin --- pkgs/by-name/sd/sdl-jstest/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix index b1cb7a1c09d0..cd9afdb4cdb1 100644 --- a/pkgs/by-name/sd/sdl-jstest/package.nix +++ b/pkgs/by-name/sd/sdl-jstest/package.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation { cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ]; - meta = with lib; { + meta = { homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; - license = licenses.gpl3; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; maintainers = [ ]; mainProgram = "sdl2-jstest"; };