diff options
Diffstat (limited to 'pkgs')
45 files changed, 822 insertions, 391 deletions
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 05f2b8b659f38..48341030bc382 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2610,6 +2610,22 @@ let }; }; + ms-vscode-remote.remote-containers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-containers"; + publisher = "ms-vscode-remote"; + version = "0.305.0"; + sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc="; + }; + meta = { + description = "Open any folder or repository inside a Docker container."; + downloadPage = "Use a container as your development environment"; + homepage = "https://code.visualstudio.com/docs/devcontainers/containers"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; + }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; diff --git a/pkgs/applications/finance/odoo/default.nix b/pkgs/applications/finance/odoo/default.nix index cfd181aa4d767..d3436f929ed1a 100644 --- a/pkgs/applications/finance/odoo/default.nix +++ b/pkgs/applications/finance/odoo/default.nix @@ -44,19 +44,19 @@ let }; }; - odoo_version = "15.0"; - odoo_release = "20230317"; + odoo_version = "16.0"; + odoo_release = "20230722"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; format = "setuptools"; - # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile + # latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile src = fetchurl { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; name = "${pname}-${version}"; - hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo + hash = "sha256-DV5JBY+2gq5mUfcvN9S5xkd+ufgEBjvyvBY1X7pPFPk="; # odoo }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 20bba7d405dcf..f662e965ff215 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -9,27 +9,28 @@ , components ? lib.optionals isFull [ "kumactl" "kuma-cp" - "kuma-prometheus-sd" "kuma-dp" ] }: buildGoModule rec { - inherit pname ; - version = "1.8.1"; - tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; + inherit pname; + version = "2.3.1"; + tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; + hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; }; + vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + + # no test files doCheck = false; - nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals isFull [ coredns ]; preBuild = '' export HOME=$TMPDIR @@ -59,6 +60,7 @@ buildGoModule rec { meta = with lib; { description = "Service mesh controller"; homepage = "https://kuma.io/"; + changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ zbioe ]; }; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index f58f62a7ae17e..f6ab1a5d17fe0 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -1,24 +1,30 @@ { lib -, fetchFromGitLab +, fetchFromGitHub , imagemagick +, mesa +, libdrm , flutter +, pulseaudio , makeDesktopItem , gnome }: +let + libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; +in flutter.buildFlutterApplication rec { pname = "fluffychat"; - version = "1.12.1"; + version = "1.13.0"; - src = fetchFromGitLab { - owner = "famedly"; + src = fetchFromGitHub { + owner = "krille-chan"; repo = "fluffychat"; - rev = "v${version}"; - hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I="; + rev = "refs/tags/v${version}"; + hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc="; }; depsListFile = ./deps.json; - vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE="; + vendorHash = "sha256-Ot96+EF8PgYQmXn0hvIWzN8StuzTgQzakRO3yf7PJAU="; desktopItem = makeDesktopItem { name = "Fluffychat"; @@ -30,6 +36,7 @@ flutter.buildFlutterApplication rec { }; nativeBuildInputs = [ imagemagick ]; + runtimeDependencies = [ pulseaudio ]; extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; postInstall = '' FAV=$out/app/data/flutter_assets/assets/favicon.png @@ -45,8 +52,12 @@ flutter.buildFlutterApplication rec { done substituteInPlace $out/share/applications/*.desktop \ --subst-var out + + patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so ''; + env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json index ab3c8684d5575..3261bffda293f 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/deps.json +++ b/pkgs/applications/networking/instant-messengers/fluffychat/deps.json @@ -1,12 +1,13 @@ [ { "name": "fluffychat", - "version": "1.12.0+3452", + "version": "1.13.0+3514", "kind": "root", "source": "root", "dependencies": [ "adaptive_dialog", "animations", + "archive", "badges", "blurhash_dart", "callkeep", @@ -61,6 +62,7 @@ "matrix_homeserver_recommendations", "native_imaging", "package_info_plus", + "pasteboard", "path_provider", "permission_handler", "pin_code_text_field", @@ -94,7 +96,6 @@ "integration_test", "msix", "translations_cleaner", - "flutter_secure_storage_windows", "geolocator_android", "wakelock_windows" ] @@ -112,7 +113,7 @@ }, { "name": "win32", - "version": "4.1.4", + "version": "5.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -121,7 +122,7 @@ }, { "name": "ffi", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -234,13 +235,6 @@ ] }, { - "name": "flutter_secure_storage_windows", - "version": "1.1.2", - "kind": "transitive", - "source": "git", - "dependencies": [] - }, - { "name": "translations_cleaner", "version": "0.0.5", "kind": "dev", @@ -252,7 +246,7 @@ }, { "name": "glob", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -319,18 +313,17 @@ }, { "name": "args", - "version": "2.4.0", + "version": "2.4.2", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "msix", - "version": "3.11.1", + "version": "3.15.0", "kind": "dev", "source": "hosted", "dependencies": [ - "flutter", "args", "yaml", "path", @@ -363,7 +356,7 @@ }, { "name": "pub_semver", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -384,7 +377,7 @@ }, { "name": "xml", - "version": "6.2.2", + "version": "6.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -395,7 +388,7 @@ }, { "name": "petitparser", - "version": "5.1.0", + "version": "5.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -404,17 +397,29 @@ }, { "name": "archive", - "version": "3.3.2", - "kind": "transitive", + "version": "3.3.7", + "kind": "direct", "source": "hosted", "dependencies": [ "crypto", - "path" + "path", + "pointycastle" ] }, { - "name": "crypto", - "version": "3.0.2", + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "convert", + "version": "3.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -423,7 +428,7 @@ }, { "name": "typed_data", - "version": "1.3.1", + "version": "1.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -431,8 +436,17 @@ ] }, { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { "name": "get_it", - "version": "7.2.0", + "version": "7.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -451,7 +465,7 @@ }, { "name": "yaml", - "version": "3.1.1", + "version": "3.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -708,7 +722,7 @@ }, { "name": "flutter_native_splash", - "version": "2.2.19", + "version": "2.3.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -727,7 +741,7 @@ }, { "name": "universal_io", - "version": "2.2.0", + "version": "2.2.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -738,7 +752,7 @@ }, { "name": "html", - "version": "0.15.3", + "version": "0.15.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -748,7 +762,7 @@ }, { "name": "csslib", - "version": "0.17.2", + "version": "0.17.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -772,7 +786,7 @@ }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -781,14 +795,14 @@ }, { "name": "lints", - "version": "2.0.1", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "dart_code_metrics", - "version": "4.21.3", + "version": "5.7.5", "kind": "dev", "source": "hosted", "dependencies": [ @@ -798,32 +812,45 @@ "args", "collection", "crypto", + "dart_code_metrics_presets", "file", "glob", "html", + "http", "meta", "path", "platform", "pub_updater", "source_span", + "uuid", "xml", "yaml" ] }, { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { "name": "pub_updater", - "version": "0.2.4", + "version": "0.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ "http", "json_annotation", - "process" + "process", + "pub_semver" ] }, { "name": "json_annotation", - "version": "4.8.0", + "version": "4.8.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -832,14 +859,13 @@ }, { "name": "http", - "version": "0.13.5", + "version": "0.13.6", "kind": "direct", "source": "hosted", "dependencies": [ "async", "http_parser", - "meta", - "path" + "meta" ] }, { @@ -855,6 +881,13 @@ ] }, { + "name": "dart_code_metrics_presets", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { "name": "ansicolor", "version": "2.0.1", "kind": "transitive", @@ -876,7 +909,7 @@ }, { "name": "dart_style", - "version": "2.2.5", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -889,7 +922,7 @@ }, { "name": "analyzer", - "version": "5.1.0", + "version": "5.13.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -909,7 +942,7 @@ }, { "name": "watcher", - "version": "1.0.2", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -918,17 +951,8 @@ ] }, { - "name": "convert", - "version": "3.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "typed_data" - ] - }, - { "name": "_fe_analyzer_shared", - "version": "49.0.0", + "version": "61.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -937,7 +961,7 @@ }, { "name": "webrtc_interface", - "version": "1.0.13", + "version": "1.1.0", "kind": "direct", "source": "hosted", "dependencies": [] @@ -1002,7 +1026,7 @@ }, { "name": "url_launcher", - "version": "6.1.10", + "version": "6.1.12", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1018,7 +1042,7 @@ }, { "name": "url_launcher_windows", - "version": "3.0.6", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1028,7 +1052,7 @@ }, { "name": "url_launcher_platform_interface", - "version": "2.1.2", + "version": "2.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1038,7 +1062,7 @@ }, { "name": "url_launcher_web", - "version": "2.0.16", + "version": "2.0.18", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1049,7 +1073,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.4", + "version": "3.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1069,7 +1093,7 @@ }, { "name": "url_launcher_ios", - "version": "6.1.3", + "version": "6.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1079,7 +1103,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.25", + "version": "6.0.36", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1098,7 +1122,7 @@ }, { "name": "video_player", - "version": "2.6.0", + "version": "2.7.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1112,7 +1136,7 @@ }, { "name": "video_player_web", - "version": "2.0.15", + "version": "2.0.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1133,7 +1157,7 @@ }, { "name": "video_player_avfoundation", - "version": "2.4.2", + "version": "2.4.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1143,7 +1167,7 @@ }, { "name": "video_player_android", - "version": "2.4.2", + "version": "2.4.9", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1162,16 +1186,54 @@ }, { "name": "vibration", - "version": "1.7.6", + "version": "1.8.1", "kind": "direct", "source": "hosted", "dependencies": [ - "flutter" + "flutter", + "device_info_plus" + ] + }, + { + "name": "device_info_plus", + "version": "9.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" ] }, { "name": "universal_html", - "version": "2.2.1", + "version": "2.2.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1195,7 +1257,7 @@ }, { "name": "unifiedpush", - "version": "4.0.3", + "version": "5.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1207,7 +1269,7 @@ }, { "name": "unifiedpush_android", - "version": "1.1.2", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1218,7 +1280,7 @@ }, { "name": "unifiedpush_platform_interface", - "version": "1.0.0", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1228,15 +1290,14 @@ }, { "name": "shared_preferences", - "version": "2.0.15", + "version": "2.2.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "shared_preferences_android", - "shared_preferences_ios", + "shared_preferences_foundation", "shared_preferences_linux", - "shared_preferences_macos", "shared_preferences_platform_interface", "shared_preferences_web", "shared_preferences_windows" @@ -1244,7 +1305,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1258,7 +1319,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.1.1", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1268,7 +1329,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.6", + "version": "2.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1292,7 +1353,7 @@ }, { "name": "shared_preferences_web", - "version": "2.0.6", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1302,18 +1363,8 @@ ] }, { - "name": "shared_preferences_macos", - "version": "2.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "shared_preferences_platform_interface" - ] - }, - { "name": "shared_preferences_linux", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1327,7 +1378,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.10", + "version": "2.1.11", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1340,7 +1391,7 @@ }, { "name": "xdg_directories", - "version": "0.2.0+3", + "version": "1.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1350,8 +1401,8 @@ ] }, { - "name": "shared_preferences_ios", - "version": "2.1.1", + "name": "shared_preferences_foundation", + "version": "2.3.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1361,7 +1412,7 @@ }, { "name": "shared_preferences_android", - "version": "2.0.17", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1429,7 +1480,7 @@ }, { "name": "share_plus", - "version": "7.0.0", + "version": "7.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1464,17 +1515,8 @@ ] }, { - "name": "uuid", - "version": "3.0.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "crypto" - ] - }, - { "name": "path_provider", - "version": "2.0.13", + "version": "2.0.15", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1488,7 +1530,7 @@ }, { "name": "path_provider_foundation", - "version": "2.2.0", + "version": "2.2.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1498,7 +1540,7 @@ }, { "name": "path_provider_android", - "version": "2.0.24", + "version": "2.0.27", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1610,7 +1652,7 @@ }, { "name": "qr_flutter", - "version": "4.0.0", + "version": "4.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1620,7 +1662,7 @@ }, { "name": "qr", - "version": "2.1.0", + "version": "3.0.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1676,7 +1718,7 @@ }, { "name": "permission_handler", - "version": "10.2.0", + "version": "10.4.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1690,7 +1732,7 @@ }, { "name": "permission_handler_platform_interface", - "version": "3.9.0", + "version": "3.11.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1701,7 +1743,7 @@ }, { "name": "permission_handler_windows", - "version": "0.1.2", + "version": "0.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1711,7 +1753,7 @@ }, { "name": "permission_handler_apple", - "version": "9.0.7", + "version": "9.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1721,7 +1763,7 @@ }, { "name": "permission_handler_android", - "version": "10.2.0", + "version": "10.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1730,8 +1772,19 @@ ] }, { + "name": "pasteboard", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js" + ] + }, + { "name": "package_info_plus", - "version": "4.0.0", + "version": "4.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1778,7 +1831,7 @@ }, { "name": "matrix_api_lite", - "version": "1.6.1", + "version": "1.7.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1796,7 +1849,7 @@ }, { "name": "matrix", - "version": "0.20.5", + "version": "0.22.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1820,6 +1873,7 @@ "random_string", "sdp_transform", "slugify", + "typed_data", "webrtc_interface" ] }, @@ -1877,7 +1931,7 @@ }, { "name": "canonical_json", - "version": "1.1.1", + "version": "1.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1920,7 +1974,7 @@ }, { "name": "latlong2", - "version": "0.8.1", + "version": "0.8.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1952,7 +2006,7 @@ }, { "name": "tuple", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -1996,7 +2050,7 @@ }, { "name": "just_audio_platform_interface", - "version": "4.2.0", + "version": "4.2.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2006,7 +2060,7 @@ }, { "name": "just_audio", - "version": "0.9.31", + "version": "0.9.34", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2032,7 +2086,7 @@ }, { "name": "audio_session", - "version": "0.1.13", + "version": "0.1.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2044,7 +2098,7 @@ }, { "name": "just_audio_web", - "version": "0.4.7", + "version": "0.4.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2055,7 +2109,7 @@ }, { "name": "image_picker", - "version": "0.8.7", + "version": "1.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2063,12 +2117,50 @@ "image_picker_android", "image_picker_for_web", "image_picker_ios", + "image_picker_linux", + "image_picker_macos", + "image_picker_platform_interface", + "image_picker_windows" + ] + }, + { + "name": "image_picker_windows", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "file_selector_windows", + "flutter", "image_picker_platform_interface" ] }, { "name": "image_picker_platform_interface", - "version": "2.6.3", + "version": "2.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "file_selector_windows", + "version": "0.9.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "file_selector_platform_interface", + "version": "2.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2079,8 +2171,54 @@ ] }, { + "name": "image_picker_macos", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_macos", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_macos", + "version": "0.9.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "image_picker_linux", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_linux", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_linux", + "version": "0.9.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { "name": "image_picker_ios", - "version": "0.8.7+1", + "version": "0.8.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2090,18 +2228,19 @@ }, { "name": "image_picker_for_web", - "version": "2.1.12", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ "flutter", "flutter_web_plugins", - "image_picker_platform_interface" + "image_picker_platform_interface", + "mime" ] }, { "name": "image_picker_android", - "version": "0.8.6+5", + "version": "0.8.7+3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2112,7 +2251,7 @@ }, { "name": "flutter_plugin_android_lifecycle", - "version": "2.0.9", + "version": "2.0.15", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2133,7 +2272,7 @@ }, { "name": "handy_window", - "version": "0.1.9", + "version": "0.3.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2185,24 +2324,24 @@ }, { "name": "flutter_webrtc", - "version": "0.9.31", + "version": "0.9.37", "kind": "direct", - "source": "git", + "source": "hosted", "dependencies": [ "collection", "dart_webrtc", "flutter", - "js", "path_provider", "webrtc_interface" ] }, { "name": "dart_webrtc", - "version": "1.0.16", + "version": "1.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ + "collection", "js", "platform_detect", "webrtc_interface" @@ -2220,7 +2359,7 @@ }, { "name": "flutter_web_auth_2", - "version": "2.1.1", + "version": "2.1.5", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2242,7 +2381,7 @@ }, { "name": "flutter_web_auth_2_platform_interface", - "version": "2.1.0", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2252,17 +2391,27 @@ }, { "name": "flutter_typeahead", - "version": "4.3.7", + "version": "4.6.2", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "flutter_keyboard_visibility" + "flutter_keyboard_visibility", + "pointer_interceptor" + ] + }, + { + "name": "pointer_interceptor", + "version": "0.9.3+4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" ] }, { "name": "flutter_keyboard_visibility", - "version": "5.4.0", + "version": "5.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2329,7 +2478,7 @@ }, { "name": "flutter_secure_storage", - "version": "7.0.1", + "version": "8.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2343,15 +2492,13 @@ ] }, { - "name": "flutter_secure_storage_web", - "version": "1.1.1", + "name": "flutter_secure_storage_windows", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ "flutter", - "flutter_secure_storage_platform_interface", - "flutter_web_plugins", - "js" + "flutter_secure_storage_platform_interface" ] }, { @@ -2365,8 +2512,20 @@ ] }, { + "name": "flutter_secure_storage_web", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface", + "flutter_web_plugins", + "js" + ] + }, + { "name": "flutter_secure_storage_macos", - "version": "2.0.1", + "version": "3.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2428,7 +2587,7 @@ }, { "name": "flutter_svg", - "version": "2.0.5", + "version": "2.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2440,7 +2599,7 @@ }, { "name": "vector_graphics_compiler", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2453,7 +2612,7 @@ }, { "name": "vector_graphics_codec", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2470,7 +2629,7 @@ }, { "name": "vector_graphics", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2480,7 +2639,7 @@ }, { "name": "flutter_map", - "version": "3.1.0", + "version": "4.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2491,7 +2650,6 @@ "latlong2", "meta", "polylabel", - "positioned_tap_detector_2", "proj4dart", "tuple", "vector_math" @@ -2543,15 +2701,6 @@ ] }, { - "name": "positioned_tap_detector_2", - "version": "1.0.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, - { "name": "polylabel", "version": "1.0.1", "kind": "transitive", @@ -2580,7 +2729,7 @@ }, { "name": "flutter_local_notifications", - "version": "12.0.4", + "version": "15.1.0+1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2593,7 +2742,7 @@ }, { "name": "timezone", - "version": "0.9.1", + "version": "0.9.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2602,7 +2751,7 @@ }, { "name": "flutter_local_notifications_platform_interface", - "version": "6.0.0", + "version": "7.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2612,13 +2761,14 @@ }, { "name": "flutter_local_notifications_linux", - "version": "1.0.0", + "version": "4.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ + "dbus", + "ffi", "flutter", "flutter_local_notifications_platform_interface", - "dbus", "path", "xdg_directories" ] @@ -2659,7 +2809,7 @@ }, { "name": "flutter_layout_grid", - "version": "2.0.3", + "version": "2.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2719,21 +2869,19 @@ }, { "name": "flutter_foreground_task", - "version": "3.10.0", + "version": "6.0.0+1", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "plugin_platform_interface", "platform", - "shared_preferences", - "shared_preferences_android", - "shared_preferences_ios" + "shared_preferences" ] }, { "name": "flutter_cache_manager", - "version": "3.3.0", + "version": "3.3.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2744,7 +2892,6 @@ "http", "path", "path_provider", - "pedantic", "rxdart", "sqflite", "uuid" @@ -2752,7 +2899,7 @@ }, { "name": "sqflite", - "version": "2.2.6", + "version": "2.2.8+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2763,7 +2910,7 @@ }, { "name": "sqflite_common", - "version": "2.4.3", + "version": "2.4.5+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2774,14 +2921,7 @@ }, { "name": "synchronized", - "version": "3.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "pedantic", - "version": "1.11.1", + "version": "3.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2815,7 +2955,7 @@ }, { "name": "file_picker", - "version": "5.3.0", + "version": "5.3.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2858,14 +2998,14 @@ }, { "name": "remove_emoji", - "version": "0.0.7", + "version": "0.0.9", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "emoji_picker_flutter", - "version": "1.5.2", + "version": "1.6.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2877,7 +3017,7 @@ }, { "name": "dynamic_color", - "version": "1.6.2", + "version": "1.6.6", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2887,32 +3027,6 @@ ] }, { - "name": "device_info_plus", - "version": "8.1.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "device_info_plus_platform_interface", - "ffi", - "file", - "flutter", - "flutter_web_plugins", - "meta", - "win32" - ] - }, - { - "name": "device_info_plus_platform_interface", - "version": "7.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "plugin_platform_interface" - ] - }, - { "name": "desktop_notifications", "version": "0.6.3", "kind": "direct", @@ -2923,7 +3037,7 @@ }, { "name": "desktop_lifecycle", - "version": "0.1.0", + "version": "0.1.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2950,7 +3064,7 @@ }, { "name": "connectivity_plus", - "version": "3.0.3", + "version": "4.0.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2984,7 +3098,7 @@ }, { "name": "chewie", - "version": "1.4.0", + "version": "1.7.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2992,7 +3106,34 @@ "flutter", "provider", "video_player", - "wakelock" + "wakelock_plus" + ] + }, + { + "name": "wakelock_plus", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "meta", + "wakelock_plus_platform_interface", + "win32", + "dbus", + "package_info_plus", + "js" + ] + }, + { + "name": "wakelock_plus_platform_interface", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "meta" ] }, { @@ -3024,7 +3165,7 @@ }, { "name": "adaptive_dialog", - "version": "1.9.0-no-macos.2", + "version": "1.9.0-x-macos-beta.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3033,10 +3174,30 @@ "dynamic_color", "flutter", "intersperse", + "macos_ui", "meta" ] }, { + "name": "macos_ui", + "version": "2.0.0-beta.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "macos_window_utils" + ] + }, + { + "name": "macos_window_utils", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { "name": "intersperse", "version": "2.0.0", "kind": "transitive", diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 6e0322c2b940e..93f8aedfb6cd1 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -102,9 +102,6 @@ buildPythonApplication rec { hardeningDisable = [ # causes redefinition of _FORTIFY_SOURCE "fortify3" - ] ++ lib.optionals stdenv.cc.isClang [ - # Causes build failure due to warning - "strictoverflow" ]; CGO_ENABLED = 0; diff --git a/pkgs/applications/video/multiviewer-for-f1/default.nix b/pkgs/applications/video/multiviewer-for-f1/default.nix index f888d77057fea..7a51720ec5d85 100644 --- a/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -22,17 +22,16 @@ , pango , xorg }: - let - id = "123097753"; + id = "123219506"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-VS1oDqib0XCEVDVt72GGz1ikwZJYnn6enAylh54PrDI="; + sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU="; }; nativeBuildInputs = [ @@ -98,6 +97,7 @@ stdenvNoCC.mkDerivation rec { license = licenses.unfree; maintainers = with maintainers; [ babeuh ]; platforms = [ "x86_64-linux" ]; + mainProgram = "multiviewer-for-f1"; }; } diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index ad48ae1e0d8c4..4cbc7b20d562f 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.27.1"; + version = "1.28.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY="; + sha256 = "sha256-vVw3mVliu9JiCgTpwBfubaOkEkNJD4Tb1M7HARg5VjA="; }; vendorHash = null; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 1834d38d7fb1e..72216d0954887 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-slim"; - version = "1.40.3"; + version = "1.40.4"; src = fetchFromGitHub { owner = "slimtoolkit"; repo = "slim"; rev = version; - hash = "sha256-fXB2rMW73F12ZO1sqUIiaky6LDiMasg3QcIgeWwtkOs="; + hash = "sha256-A5qMg+mgcvK0YyJLbnFdZRS3s+OFWFaLKmnyvKj4r4g="; }; vendorHash = null; diff --git a/pkgs/development/interpreters/cyber/default.nix b/pkgs/development/interpreters/cyber/default.nix index 9c1d94b0c7f87..4d756b152d44e 100644 --- a/pkgs/development/interpreters/cyber/default.nix +++ b/pkgs/development/interpreters/cyber/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cyber"; - version = "unstable-2023-08-11"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "fubark"; repo = "cyber"; - rev = "242ba2573cbac2acecc8c06878a8d754dd7a8716"; - hash = "sha256-jArkFdvWnHNouNGsTn8O2lbU7eZdLbPD0xEfkrFH5Aw="; + rev = "be76bc13590285cffa502c3c97470a80ff1f27bd"; + hash = "sha256-DhGp+vHz+FfF9ZGopQshF2t0Q4/yeN7CEpIlPliPBgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index e6e6b24360a42..12a3fd8e01573 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -208,7 +208,8 @@ let import ../qtModule.nix { inherit perl; - inherit lib; + inherit lib stdenv; + inherit buildPackages; # Use a variant of mkDerivation that does not include wrapQtApplications # to avoid cyclic dependencies between Qt modules. mkDerivation = diff --git a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh index 1b57d676e1fc5..0e23ec1432182 100644 --- a/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qtbase-setup-hook.sh @@ -1,4 +1,5 @@ if [[ -n "${__nix_qtbase-}" ]]; then + if [ -z "${dontWorryAboutQtMismatch-}" ]; then # Throw an error if a different version of Qt was already set up. if [[ "$__nix_qtbase" != "@dev@" ]]; then echo >&2 "Error: detected mismatched Qt dependencies:" @@ -6,6 +7,7 @@ if [[ -n "${__nix_qtbase-}" ]]; then echo >&2 " $__nix_qtbase" exit 1 fi + fi else # Only set up Qt once. __nix_qtbase="@dev@" diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9f0feaf94e584..ffd2d06769ff3 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -29,10 +29,15 @@ , developerBuild ? false , decryptSslTraffic ? false , testers +, buildPackages }: let debugSymbols = debug || developerBuild; + qtPlatformCross = plat: with plat; + if isLinux + then "linux-generic-g++" + else throw "Please add a qtPlatformCross entry for ${plat.config}"; in stdenv.mkDerivation (finalAttrs: { @@ -83,6 +88,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ bison flex gperf lndir perl pkg-config which ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; + # `qtbase` expects to find `cc` (with no prefix) in the + # `$PATH`, so the following is needed even if + # `stdenv.buildPlatform.canExecute stdenv.hostPlatform` + depsBuildBuild = [ buildPackages.stdenv.cc ]; + propagatedNativeBuildInputs = [ lndir ]; # libQt5Core links calls CoreFoundation APIs that call into the system ICU. Binaries linked @@ -162,6 +172,11 @@ stdenv.mkDerivation (finalAttrs: { export MAKEFLAGS+=" -j$NIX_BUILD_CORES" ./bin/syncqt.pl -version $version + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + # QT's configure script will refuse to use pkg-config unless these two environment variables are set + export PKG_CONFIG_SYSROOT_DIR=/ + export PKG_CONFIG_LIBDIR=${lib.getLib pkg-config}/lib + echo 'QMAKE_PKG_CONFIG=''$''${CROSS_COMPILE}pkg-config' >> mkspecs/devices/${qtPlatformCross stdenv.hostPlatform}/qmake.conf ''; postConfigure = '' @@ -209,6 +224,8 @@ stdenv.mkDerivation (finalAttrs: { # To prevent these failures, we need to override PostgreSQL detection. PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq"; + # do not pass --host and --build to configureFlags as QT's configure script doesn't understand them + configurePlatforms = [ ]; # TODO Remove obsolete and useless flags once the build will be totally mastered configureFlags = [ "-plugindir $(out)/$(qtPluginPrefix)" @@ -235,6 +252,9 @@ stdenv.mkDerivation (finalAttrs: { "-L" "${icu.out}/lib" "-I" "${icu.dev}/include" "-pch" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-device ${qtPlatformCross stdenv.hostPlatform}" + "-device-option CROSS_COMPILE=${stdenv.cc.targetPrefix}" ] ++ lib.optional debugSymbols "-debug" ++ lib.optionals developerBuild [ diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index bddbf254c5f7f..75deee58ea604 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -1,4 +1,8 @@ -{ lib, mkDerivation, perl }: +{ lib +, stdenv +, mkDerivation, perl +, buildPackages +}: let inherit (lib) licenses maintainers platforms; in @@ -18,6 +22,7 @@ mkDerivation (args // { nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ perl self.qmake ]; propagatedBuildInputs = (args.qtInputs or []) ++ (args.propagatedBuildInputs or []); + depsBuildBuild = [ buildPackages.stdenv.cc ]; outputs = args.outputs or [ "out" "dev" ]; setOutputFlags = args.setOutputFlags or false; @@ -74,4 +79,7 @@ mkDerivation (args // { maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; platforms = platforms.unix; } // (args.meta or {}); + +} // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { + dontWorryAboutQtMismatch = true; }) diff --git a/pkgs/development/misc/gokrazy/default.nix b/pkgs/development/misc/gokrazy/default.nix new file mode 100644 index 0000000000000..dfc29a0af08e5 --- /dev/null +++ b/pkgs/development/misc/gokrazy/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gokrazy"; + version = "unstable-2023-08-12"; + + src = fetchFromGitHub { + owner = "gokrazy"; + repo = "tools"; + rev = "23cde3b0d858497a63c21e93ad30859bf197995f"; + hash = "sha256-oqtkC04TaOkcXkGAZzATCBA0XnFsx7bSGP9ODyhgAxQ="; + }; + + vendorHash = "sha256-rIIMqYMgLNCMYEH+44v79i8yGbHDmUY21X3h1E2jP9Q="; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + subPackages = [ "cmd/gok" ]; + + meta = with lib; { + description = "Turn your Go program(s) into an appliance running on the Raspberry Pi 3, Pi 4, Pi Zero 2 W, or amd64 PCs!"; + homepage = "https://github.com/gokrazy/gokrazy"; + license = licenses.bsd3; + maintainers = with maintainers; [ shayne ]; + mainProgram = "gok"; + }; +} diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index c3bf5066385d4..eec4830837f03 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.6-2"; + version = "0.5.6-4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-xxKZI6yb8h1eqtfTpa8SqL/hnIWhFtuBP7RXQvI/Z/4="; + hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/fe25519/default.nix b/pkgs/development/python-modules/fe25519/default.nix index e3f0026060912..6a935cadd179b 100644 --- a/pkgs/development/python-modules/fe25519/default.nix +++ b/pkgs/development/python-modules/fe25519/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "fe25519"; - version = "1.4.2"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VwCw/sS8Pzhscoa6yCRGbB9X+CtRVn8xyBEpKfGyhhY="; + hash = "sha256-la+17tPHjceMTe7Wk8DGVaSptk8XJa+l7GTeqLIFDvs="; }; patches = [ diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index deb3db5f1815c..8bff8aa7849c8 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.35.0"; + version = "0.35.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-PogpRQWeFhBpPlesHBUq9F6QA384/u+wIYsqkjCH3Sk="; + hash = "sha256-5Iy4UrB7rn11dmQxh/7EtvrrxkXH8k1tYQkREJJXsOs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index 65f385db922f8..26f34fd5f13aa 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -4,17 +4,31 @@ , isPy3k , pytest , unicodecsv +, rustPlatform }: buildPythonPackage rec { pname = "jellyfish"; - version = "0.9.0"; + version = "1.0.0"; disabled = !isPy3k; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "40c9a2ffd8bd3016f7611d424120442f627f56d518a106847dc93f0ead6ad79a"; + hash = "sha256-iBquNnGZm7B85QwnaW8pyn6ELz4SOswNtlJcmZmIG9Q="; + }; + + nativeBuildInputs = with rustPlatform; [ + maturinBuildHook + cargoSetupHook + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}-rust-dependencies"; + hash = "sha256-Grk+n4VCPjirafcRWWI51jHw/IFUYkBtbXY739j0MFI="; }; nativeCheckInputs = [ pytest unicodecsv ]; diff --git a/pkgs/development/python-modules/particle/default.nix b/pkgs/development/python-modules/particle/default.nix index 1a9f4fef309b4..69eabb7cf57f3 100644 --- a/pkgs/development/python-modules/particle/default.nix +++ b/pkgs/development/python-modules/particle/default.nix @@ -1,6 +1,7 @@ { lib , attrs , buildPythonPackage +, deprecated , fetchFromGitHub , fetchPypi , hatch-vcs @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "particle"; - version = "0.21.2"; + version = "0.23.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-BDTTmqtPxyvORSoR+CJzb5WTfF9BFrDoMSVOvO9s/Ns="; + hash = "sha256-2BD4/CfeuOf9ZBdAF9lgfVBSIknAlzoACOWA+T2xF1A="; }; postPatch = '' @@ -39,6 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + deprecated hepunits ]; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 976fd81f6cfd4..3fca04a27db48 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.13.18"; + version = "8.13.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s2DHViUoBdRLRHtbym0lDPa9bGm28PQljzv+Wrgb72k="; + hash = "sha256-OBgCR2lyQMzt103sS/vbwiuxCLnF+ZHycMo+QTleb5Y="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 055d5ff857283..4c929ceef965a 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -15,18 +15,18 @@ buildPythonPackage rec { pname = "rustworkx"; - version = "0.12.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-d/KCxhJdyzhTjwJZ+GsXJE4ww30iPaXcPngpCi4hBZw="; + hash = "sha256-WwQuvRMDGiY9VrWPfxL0OotPCUhCsvbXoVSCNhmIF/g="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-imhiPj763iumRQb+oeBOpICD1nCvzZx+3yQWu1QRRQQ="; + hash = "sha256-QuzBJyM83VtB6CJ7i9/SFE8h6JbxkX/LQ9lOFSQIidU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 1482d0a6589f1..a561bcbdfb740 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.23.3"; + version = "3.23.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w="; + hash = "sha256-vf1mnszEs/r/IyggCklAjNXsrZ8ZtgIsSttVS7s6JiE="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 5985b96d6dc94..91c56472e77ec 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.4"; + version = "0.18.5"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9dwkylr+aCTGw/VIY90nxq8IkqBASeEfdr5JGz7pZrc="; + hash = "sha256-0NJsZex054CWfKX2wyJRd6Cnxa89mNrZN59VqIV2MD8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4516de52b3e84..448b8a1b7cc1a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.214.0"; + version = "0.215.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-N3eunmUl08RPu54k1QQWqgKa9RS0uzVVI2f0kCbmb2w="; + sha256 = "sha256-n6swStUU+mKeUhs94h71eCJk02yP6QFAkpDz67DJmXg="; }; postPatch = '' diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 29b98eb77fa52..47b01955868f4 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -25,15 +25,15 @@ in rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.1.0"; + version = "2.1.1"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-FdmjfywvDD3mo1d1pUQMYvebo5AUTa99gQbQuOWmZZk="; + hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg="; }; - cargoHash = "sha256-onPzM9E53VUogZdIu3jAeB4dL3MC2FP3b6QWZ5Tr3j0="; + cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I="; nativeBuildInputs = [ installShellFiles pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-component/Cargo.lock b/pkgs/development/tools/rust/cargo-component/Cargo.lock index bb7d4a06c01f0..e7264f5d7f4cf 100644 --- a/pkgs/development/tools/rust/cargo-component/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-component/Cargo.lock @@ -568,9 +568,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.82" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "libc", ] @@ -769,9 +769,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" dependencies = [ "serde", ] @@ -1163,9 +1163,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -2006,12 +2006,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -2373,9 +2373,9 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" dependencies = [ "base64 0.21.2", "bytes", @@ -2586,18 +2586,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.183" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", @@ -2659,9 +2659,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1402f54f9a3b9e2efe71c1cea24e648acce55887983553eeb858cf3115acfd49" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ "base64 0.21.2", "chrono", @@ -2676,9 +2676,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9197f1ad0e3c173a0222d3c4404fb04c3afe87e962bcb327af73e8301fa203c7" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", @@ -2848,9 +2848,9 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "tempfile" -version = "3.7.1" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc02fddf48964c42031a0b3fe0428320ecf3a73c401040fc0096f97794310651" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", @@ -3171,9 +3171,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -3533,9 +3533,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -3723,11 +3723,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.10.1" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", + "cfg-if", + "windows-sys", ] [[package]] @@ -3766,8 +3767,7 @@ dependencies = [ [[package]] name = "wit-bindgen" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86fe4c862e5d3d06d65ff0e9b5da8e84217af535bca6fc3acffed9eff0f5c2" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "bitflags 2.4.0", "wit-bindgen-rust-macro", @@ -3776,8 +3776,7 @@ dependencies = [ [[package]] name = "wit-bindgen-core" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed17e12f4277a1de3a33ef68e4934bd10a9c295053f4de803b5c0ba856b4c08" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "wit-component", @@ -3787,8 +3786,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b6a165d93a825badf9c2db8c4033d76455807a4ab5f6890ccd01936d16b20ed" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "heck", @@ -3801,8 +3799,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-lib" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e00b553c5b5fcdabe295cb1cdb369f76f72e8c626be1930e99bb01a4e7f4dc" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "heck", "wit-bindgen-core", @@ -3811,8 +3808,7 @@ dependencies = [ [[package]] name = "wit-bindgen-rust-macro" version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d49b81b63fa30c3b13a559cd89dc3a721ccd94736a0b375cae718da5995d64" +source = "git+https://github.com/bytecodealliance/wit-bindgen#749c01697bb3b11daeae4225789e14b765dcf839" dependencies = [ "anyhow", "proc-macro2", diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 3fa4f826618a6..4942045a49347 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,19 +9,20 @@ rustPlatform.buildRustPackage { pname = "cargo-component"; - version = "unstable-2023-08-19"; + version = "unstable-2023-08-24"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; - rev = "4abbb89ed356887a5b7e822c507cc1d02cbe8935"; - hash = "sha256-MZQcyK8AN/TRplTNuPkNMFFdJIlWxHEB4W6z5PnFDxw="; + rev = "a4ee64625a5248234397a9c7c2a7513bb025b030"; + hash = "sha256-7fnzIzWb2f1tJfH3mLMesQtNCy4Zg7I/T+lGiorifY8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "warg-api-0.1.0" = "sha256-A5FQ/nbuzV8ockV6vOMKUEoJKeaId3oyZU1QeNpd1Zc="; + "wit-bindgen-0.10.0" = "sha256-/QZIIbUzDFUb5wAGoKFg1BbgNUEmP06ZJKVzhwlPecE="; }; }; diff --git a/pkgs/games/corsix-th/default.nix b/pkgs/games/corsix-th/default.nix index 75a676a057c17..0dd8edb598205 100644 --- a/pkgs/games/corsix-th/default.nix +++ b/pkgs/games/corsix-th/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "corsix-th"; - version = "0.66"; + version = "0.67"; src = fetchFromGitHub { owner = "CorsixTH"; repo = "CorsixTH"; rev = "v${finalAttrs.version}"; - hash = "sha256-GsZU2FHcFRlwN3hnFTyQmUK6kJLwnarKDtvg+DDc+mk="; + hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE="; }; luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]); diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index d8a6882671e60..499bef7e23758 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -88,12 +88,12 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.9"; + version = "1.10.10"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "sha256-65DH2HxiF8wqzmzbIqaQZjSa/JPERHIS2FW6F18c6Pw="; + sha256 = "sha256-3Mm/hbMwnlwbtiOFlODtKItVyj34O3beZDlV8YoJmts="; }; postPatch = '' diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 1d339c1ddd0b1..e2c714100f903 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,6 +1,31 @@ { lib, stdenv, buildEnv, runCommand, fetchurl, file, texlive, writeShellScript, writeText }: -{ +rec { + + mkTeXTest = lib.makeOverridable ( + { name + , format + , text + , texLive ? texlive.combined.scheme-small + , options ? "-interaction=errorstopmode" + , preTest ? "" + , postTest ? "" + , ... + }@attrs: runCommand "texlive-test-tex-${name}" + ({ + nativeBuildInputs = [ texLive ] ++ attrs.nativeBuildInputs or [ ]; + text = builtins.toFile "${name}.tex" text; + } // builtins.removeAttrs attrs [ "nativeBuildInputs" "text" "texLive" ]) + '' + export HOME="$(mktemp -d)" + mkdir "$out" + cd "$out" + cp "$text" "$name.tex" + ${preTest} + $format $options "$name.tex" + ${postTest} + '' + ); tlpdbNix = runCommand "texlive-test-tlpdb-nix" { nixpkgsTlpdbNix = ../../tools/typesetting/tex/texlive/tlpdb.nix; @@ -11,34 +36,32 @@ diff -u "''${nixpkgsTlpdbNix}" "''${tlpdbNix}" | tee "$out/tlpdb.nix.patch" ''; - opentype-fonts = runCommand "texlive-test-opentype" { - nativeBuildInputs = [ - (with texlive; combine { inherit scheme-medium libertinus-fonts; }) - ]; - input = builtins.toFile "opentype-testfile.tex" '' - \documentclass{article} - \usepackage{fontspec} - \setmainfont{Libertinus Serif} - \begin{document} - \LaTeX{} is great - \end{document} - ''; - } - '' - export HOME="$(mktemp -d)" - # We use the same testfile to test two completely different - # font discovery mechanisms, both of which were once broken: - # - lualatex uses its own luaotfload script (#220228) - # - xelatex uses fontconfig (#228196) - # both of the following two commands need to succeed. - lualatex -halt-on-error "$input" - xelatex -halt-on-error "$input" - echo success > $out - ''; + # test two completely different font discovery mechanisms, both of which were once broken: + # - lualatex uses its own luaotfload script (#220228) + # - xelatex uses fontconfig (#228196) + opentype-fonts = lib.recurseIntoAttrs rec { + lualatex = mkTeXTest { + name = "opentype-fonts-lualatex"; + format = "lualatex"; + texLive = texlive.combine { inherit (texlive) scheme-small libertinus-fonts; }; + text = '' + \documentclass{article} + \usepackage{fontspec} + \setmainfont{Libertinus Serif} + \begin{document} + \LaTeX{} is great + \end{document} + ''; + }; + xelatex = lualatex.override { + name = "opentype-fonts-xelatex"; + format = "xelatex"; + }; + }; chktex = runCommand "texlive-test-chktex" { nativeBuildInputs = [ - (with texlive; combine { inherit scheme-infraonly chktex; }) + (texlive.combine { inherit (texlive) scheme-infraonly chktex; }) ]; input = builtins.toFile "chktex-sample.tex" '' \documentclass{article} @@ -76,7 +99,7 @@ # test dvipng's limited capability to render postscript specials via GS ghostscript = runCommand "texlive-test-ghostscript" { - nativeBuildInputs = [ file (with texlive; combine { inherit scheme-small dvipng; }) ]; + nativeBuildInputs = [ file (texlive.combine { inherit (texlive) scheme-small dvipng; }) ]; input = builtins.toFile "postscript-sample.tex" '' \documentclass{minimal} \begin{document} @@ -143,8 +166,8 @@ texdoc = runCommand "texlive-test-texdoc" { nativeBuildInputs = [ - (with texlive; combine { - inherit scheme-infraonly luatex texdoc; + (texlive.combine { + inherit (texlive) scheme-infraonly luatex texdoc; pkgFilter = pkg: lib.elem pkg.tlType [ "run" "bin" "doc" ]; }) ]; @@ -155,6 +178,115 @@ grep texdoc.pdf "$out" ''; + # check that the default language is US English + defaultLanguage = lib.recurseIntoAttrs rec { + # language.def + etex = mkTeXTest { + name = "default-language-etex"; + format = "etex"; + text = '' + \catcode`\@=11 + \ifnum\language=\lang@USenglish \message{[tests.texlive] Default language is US English.} + \else\errmessage{[tests.texlive] Error: default language is NOT US English.}\fi + \ifnum\language=0\message{[tests.texlive] Default language has id 0.} + \else\errmessage{[tests.texlive] Error: default language does NOT have id 0.}\fi + \bye + ''; + }; + # language.dat + latex = mkTeXTest { + name = "default-language-latex"; + format = "latex"; + text = '' + \makeatletter + \ifnum\language=\l@USenglish \GenericWarning{}{[tests.texlive] Default language is US English} + \else\GenericError{}{[tests.texlive] Error: default language is NOT US English}{}{}\fi + \ifnum\language=0\GenericWarning{}{[tests.texlive] Default language has id 0} + \else\GenericError{}{[tests.texlive] Error: default language does NOT have id 0}{}{}\fi + \stop + ''; + }; + # language.dat.lua + luatex = etex.override { + name = "default-language-luatex"; + format = "luatex"; + }; + }; + + # check that all languages are available, including synonyms + allLanguages = let hyphenBase = lib.head texlive.hyphen-base.pkgs; texLive = texlive.combined.scheme-full; in + lib.recurseIntoAttrs { + # language.def + etex = mkTeXTest { + name = "all-languages-etex"; + format = "etex"; + inherit hyphenBase texLive; + text = '' + \catcode`\@=11 + \input kvsetkeys.sty + \def\CheckLang#1{ + \ifcsname lang@#1\endcsname\message{[tests.texlive] Found language #1} + \else\errmessage{[tests.texlive] Error: missing language #1}\fi + } + \comma@parse{@texLanguages@}\CheckLang + \bye + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^\\addlanguage\s*\{([^}]+)\}.*$/\1/p' < "$hyphenBase"/tex/generic/config/language.def)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + # language.dat + latex = mkTeXTest { + name = "all-languages-latex"; + format = "latex"; + inherit hyphenBase texLive; + text = '' + \makeatletter + \@for\Lang:=italian,@texLanguages@\do{ + \ifcsname l@\Lang\endcsname + \GenericWarning{}{[tests.texlive] Found language \Lang} + \else + \GenericError{}{[tests.texlive] Error: missing language \Lang}{}{} + \fi + } + \stop + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^([^%= \t]+).*$/\1/p' < "$hyphenBase"/tex/generic/config/language.dat)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + # language.dat.lua + luatex = mkTeXTest { + name = "all-languages-luatex"; + format = "luatex"; + inherit hyphenBase texLive; + text = '' + \directlua{ + require('luatex-hyphen.lua') + langs = '@texLanguages@,' + texio.write('\string\n') + for l in langs:gmatch('([^,]+),') do + if luatexhyphen.lookupname(l) \string~= nil then + texio.write('[tests.texlive] Found language '..l..'.\string\n') + else + error('[tests.texlive] Error: missing language '..l..'.', 2) + end + end + } + \bye + ''; + preTest = '' + texLanguages="$(sed -n -E 's/^.*\[("|'\''')(.*)("|'\''')].*$/\2/p' < "$hyphenBase"/tex/generic/config/language.dat.lua)" + texLanguages="''${texLanguages//$'\n'/,}" + substituteInPlace "$name.tex" --subst-var texLanguages + ''; + }; + }; + # test that language files are generated as expected hyphen-base = runCommand "texlive-test-hyphen-base" { hyphenBase = lib.head texlive.hyphen-base.pkgs; @@ -511,4 +643,25 @@ echo "$errorText" false ''); + + # verify that all fixed hashes are present + # this is effectively an eval-time assertion, converted into a derivation for + # ease of testing + fixedHashes = with lib; let + combine = findFirst (p: (head p.pkgs).pname == "combine") { pkgs = []; } (head texlive.collection-latexextra.pkgs).tlDeps; + all = concatLists (map (p: p.pkgs or []) (attrValues (removeAttrs texlive [ "bin" "combine" "combined" "tlpdb" ]))) ++ combine.pkgs; + fods = filter (p: isDerivation p && p.tlType != "bin") all; + errorText = concatMapStrings (p: optionalString (! p ? outputHash) "${p.pname + optionalString (p.tlType != "run") ("." + p.tlType)} does not have a fixed output hash\n") fods; + in runCommand "texlive-test-fixed-hashes" { + inherit errorText; + passAsFile = [ "errorText" ]; + } '' + if [[ -s "$errorTextPath" ]] ; then + cat "$errorTextPath" + echo Failed: some TeX Live packages do not have fixed output hashes. Please read UPGRADING.md for how to generate a new fixed-hashes.nix. + exit 1 + else + touch "$out" + fi + ''; } diff --git a/pkgs/tools/admin/amazon-ec2-utils/default.nix b/pkgs/tools/admin/amazon-ec2-utils/default.nix index 1225005cfb79b..ed472b2a930e1 100644 --- a/pkgs/tools/admin/amazon-ec2-utils/default.nix +++ b/pkgs/tools/admin/amazon-ec2-utils/default.nix @@ -1,30 +1,33 @@ { stdenv , lib , fetchFromGitHub -, curl -, gawk +, bash , python3 , installShellFiles -, bash +, gawk +, curl }: + stdenv.mkDerivation rec { pname = "amazon-ec2-utils"; - version = "2.0"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "aws"; + owner = "amazonlinux"; repo = "amazon-ec2-utils"; - rev = "v${version}"; - hash = "sha256-u1rHBV8uVcCywvQNYagtDleYB12tmhyqDbXTBzt45dk="; + rev = "refs/tags/v${version}"; + hash = "sha256-Yr6pVwyvyVGV4xrjL7VFSkRH8d1w8VLPMTVjXfneJUM="; }; outputs = [ "out" "man" ]; strictDeps = true; + buildInputs = [ - python3 bash + python3 ]; + nativeBuildInputs = [ installShellFiles ]; @@ -66,9 +69,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/aws/amazon-ec2-utils"; + changelog = "https://github.com/amazonlinux/amazon-ec2-utils/releases/tag/v${version}"; description = "Contains a set of utilities and settings for Linux deployments in EC2"; + homepage = "https://github.com/amazonlinux/amazon-ec2-utils"; license = licenses.mit; - maintainers = with maintainers; [ ketzacoatl thefloweringash ]; + maintainers = with maintainers; [ ketzacoatl thefloweringash anthonyroussel ]; }; } diff --git a/pkgs/tools/misc/url-parser/default.nix b/pkgs/tools/misc/url-parser/default.nix index d5655324a0a52..27df534d8756c 100644 --- a/pkgs/tools/misc/url-parser/default.nix +++ b/pkgs/tools/misc/url-parser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "url-parser"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; - rev = "v${version}"; - hash = "sha256-rOL6merwQ6CQkdsYGOpFttkJIy2EXCKMGIbAqqmYdvM="; + rev = "refs/tags/v${version}"; + hash = "sha256-A+uoxwPdWdy12Avl2Ci+zd9TFmQFA22pMbsxtWpNPpc="; }; - vendorHash = "sha256-ZaZlIGk44eX0ER2sdLdSvN2qdKVyEPsXjfCuJzJGspE="; + vendorHash = "sha256-8doDVHyhQKsBeN1H73KV/rxhpumDLIzjahdjtW79Bek="; ldflags = [ "-s" @@ -26,6 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Simple command-line URL parser"; homepage = "https://github.com/thegeeklab/url-parser"; + changelog = "https://github.com/thegeeklab/url-parser/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 62c4e8c76a66b..828e3e1ad0c50 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "sha256-wVisE4YAK52yfeM2itnBqCmhRKlrKRs0NEppQzZPok8="; + sha256 = "sha256-Lq3MMIPPEo1yJZ/xE3m9Y/V+cJl17IRkTBVjnr/avHw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index 7fa64aae7d25a..85f48644b96e5 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - hash = "sha256-9WQdudO2tIvxDHfJ87zvJeMfpuFSr4D5zGteL7Od2fQ="; + hash = "sha256-4wfkNKtF+txsil25HQtS/a/p8n9LWpUHwZVWcQ2u3+c="; }; - cargoHash = "sha256-aRN6V6r+JYi6yUcXei2f7l7oZ+8IkUmw1sgOwZJOtIE="; + cargoHash = "sha256-+dXbVNfE0GKVySySiISqOdRqR6BLgwUC8U4PB1wsnvs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/system/rex/default.nix b/pkgs/tools/system/rex/default.nix index 0befdbd2a1e0e..980874322bb84 100644 --- a/pkgs/tools/system/rex/default.nix +++ b/pkgs/tools/system/rex/default.nix @@ -73,6 +73,10 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; + postPatch = '' + patchShebangs bin + ''; + fixupPhase = '' for sh in bash zsh; do substituteInPlace ./share/rex-tab-completion.$sh \ diff --git a/pkgs/tools/system/sg3_utils/default.nix b/pkgs/tools/system/sg3_utils/default.nix index 5aca34e344ba8..3975a5927f475 100644 --- a/pkgs/tools/system/sg3_utils/default.nix +++ b/pkgs/tools/system/sg3_utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sg3_utils"; - version = "1.47"; + version = "1.48"; src = fetchurl { url = "https://sg.danny.cz/sg/p/sg3_utils-${version}.tgz"; - sha256 = "sha256-hnPH+sqEm2s0dkMy0qqR9y2wW/9zgruDbQaIeVGZw+E="; + sha256 = "sha256-1itsPPIDkPpzVwRDkAhBZtJfHZMqETXEULaf5cKD13M="; }; meta = with lib; { diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index db51febfdc4d0..17e04df844536 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.9.5"; + version = "1.9.6"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-qbAus0RgocbkC9eOmoiAOoyZw58LPDZlJgoRA/SzhQI="; + hash = "sha256-eU5mMUDUh5eMzd4oLc0XOHapt1hhODWXQJ+OJAy3tWc="; }; vendorHash = "sha256-QxcDa499XV43p8fstENOtfe3iZ176R5/Ub5iovXlYIM="; diff --git a/pkgs/tools/text/mmdoc/default.nix b/pkgs/tools/text/mmdoc/default.nix index a570d0b9558e9..312a4f94b22f9 100644 --- a/pkgs/tools/text/mmdoc/default.nix +++ b/pkgs/tools/text/mmdoc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mmdoc"; - version = "0.15.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = version; - hash = "sha256-xOi91BSQh+AN13V6YyAzOe7kUsyPAvUKWTJ+PUPlPJQ="; + hash = "sha256-W48ndjWrdJphvGDDUtcLZLBzsTfeLCi3k6UrHVroBcA="; }; nativeBuildInputs = [ ninja meson pkg-config xxd ]; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 6c423b48d9565..c7dfcd87a6124 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-t0M0b4q/25gEY3+LhGEgkKJAK1d6kni6uH0VW+yQco0="; + hash = "sha256-VkONia3xhhgCcq+dh5lNYoj3C8abDYNG7JfoBXomMUw="; }; buildInputs = [ diff --git a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix index 1415d2d39f9f8..2e9572f168a5e 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-texlive-package.nix @@ -29,6 +29,7 @@ , hasManpages ? false , hasRunfiles ? false , hasTlpkg ? false +, extraNativeBuildInputs ? [ ] , ... }@args: @@ -119,6 +120,7 @@ let inherit meta; # shebang interpreters buildInputs = (args.extraBuildInputs or [ ]) ++ [ bash perl ] ++ (lib.attrVals (args.scriptExts or [ ]) extToInput); + nativeBuildInputs = extraNativeBuildInputs; # absolute scripts folder scriptsFolder = lib.optionalString (run ? outPath) (run.outPath + "/scripts/" + args.scriptsFolder or pname); # binaries info diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 9839d764adf4e..90a65ab1405e3 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -4,7 +4,7 @@ */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz -, makeWrapper +, makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 , coreutils, findutils, gawk, getopt, gnugrep, gnumake, gnupg, gnused, gzip, ncurses, zip , libfaketime, asymptote, biber-ms, makeFontsConf @@ -376,6 +376,8 @@ let extraRevision = "-tlpdb${toString tlpdbVersion.revision}"; extraVersion = "-tlpdb-${toString tlpdbVersion.revision}"; + extraNativeBuildInputs = [ installShellFiles ]; + # build Data.tlpdb.lua (part of the 'tlType == "run"' package) postUnpack = '' if [[ -f "$out"/scripts/texdoc/texdoc.tlu ]]; then @@ -392,6 +394,18 @@ let cp texdoc/cache-tlpdb.lua "$out"/scripts/texdoc/Data.tlpdb.lua fi ''; + + # install zsh completion + postFixup = '' + TEXMFCNF="${bin.core}"/share/texmf-dist/web2c TEXMF="$scriptsFolder/../.." \ + texlua "$out"/bin/texdoc --print-completion zsh > "$TMPDIR"/_texdoc + substituteInPlace "$TMPDIR"/_texdoc \ + --replace 'compdef __texdoc texdoc' '#compdef texdoc' \ + --replace '$(kpsewhich -var-value TEXMFROOT)/tlpkg/texlive.tlpdb' '$(kpsewhich Data.tlpdb.lua)' \ + --replace '/^name[^.]*$/ {print $2}' '/^ \["[^"]*"\] = {$/ { print substr($1,3,length($1)-4) }' + echo '__texdoc' >> "$TMPDIR"/_texdoc + installShellCompletion --zsh "$TMPDIR"/_texdoc + ''; }; "texlive.infra" = { @@ -496,11 +510,7 @@ let assertions = with lib; assertMsg (tlpdbVersion.year == version.texliveYear) "TeX Live year in texlive does not match tlpdb.nix, refusing to evaluate" && - assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate" && - (!useFixedHashes || - (let all = concatLists (catAttrs "pkgs" (attrValues tl)); - fods = filter (p: isDerivation p && p.tlType != "bin") all; - in builtins.all (p: assertMsg (p ? outputHash) "The TeX Live package '${p.pname + lib.optionalString (p.tlType != "run") ("." + p.tlType)}' does not have a fixed output hash. Please read UPGRADING.md on how to build a new 'fixed-hashes.nix'.") fods)); + assertMsg (tlpdbVersion.frozen == version.final) "TeX Live final status in texlive does not match tlpdb.nix, refusing to evaluate"; in tl // { diff --git a/pkgs/tools/typesetting/typstfmt/default.nix b/pkgs/tools/typesetting/typstfmt/default.nix index 5e83892f528ad..0c7b82871760e 100644 --- a/pkgs/tools/typesetting/typstfmt/default.nix +++ b/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage { pname = "typstfmt"; - version = "unstable-2023-08-15"; + version = "unstable-2023-08-22"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; - rev = "0e5cf2769ef46ca8f6627c688cb8f848ee279a88"; - hash = "sha256-xdmEixbINjVjXlGwdBqDPcd4YHcT/WeswlRNEwpnfx4="; + rev = "578d39fb304020d0c26118e4eeab272868c9d525"; + hash = "sha256-pF0i3yqGOzbN3CMELhZ7JElOUdBZCnp3cLqa9VONHhI="; }; cargoLock = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a440ec395e513..70b39b5c52b72 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -855,6 +855,7 @@ mapAliases ({ kubei = kubeclarity; # Added 2023-05-20 kubeless = throw "kubeless is deprecated and archived by upstream"; # Added 2022-04-05 kubicorn = throw "kubicorn has been dropped due to the lack of maintenance from upstream since 2019"; # Added 2022-05-30 + kuma-prometheus-sd = throw "kuma-prometheus-sd has been deprecated upstream"; # Added 2023-07-02 kvm = throw "'kvm' has been renamed to/replaced by 'qemu_kvm'"; # Converted to throw 2022-02-22 ### L ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b41cf6aebc2ef..d55d5d799cf76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -676,6 +676,8 @@ with pkgs; goda = callPackage ../development/tools/goda { }; + gokrazy = callPackage ../development/misc/gokrazy { }; + gojq = callPackage ../development/tools/gojq { }; govulncheck = callPackage ../tools/security/govulncheck { }; @@ -33356,10 +33358,6 @@ with pkgs; components = ["kuma-dp"]; pname = "kuma-dp"; }; - kuma-prometheus-sd = callPackage ../applications/networking/cluster/kuma { - components = ["kuma-prometheus-sd"]; - pname = "kuma-prometheus-sd"; - }; kile-wl = callPackage ../applications/misc/kile-wl { }; |