From 536fe796af179c662b4d12c7c474ae0da57a5717 Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Sat, 4 Nov 2023 00:41:53 +0100 Subject: [PATCH 001/153] intiface-central: init at 2.5.3 --- .../in/intiface-central/corrosion.patch | 23 + pkgs/by-name/in/intiface-central/deps.json | 1761 +++++++++++++++++ pkgs/by-name/in/intiface-central/package.nix | 79 + 3 files changed, 1863 insertions(+) create mode 100644 pkgs/by-name/in/intiface-central/corrosion.patch create mode 100644 pkgs/by-name/in/intiface-central/deps.json create mode 100644 pkgs/by-name/in/intiface-central/package.nix diff --git a/pkgs/by-name/in/intiface-central/corrosion.patch b/pkgs/by-name/in/intiface-central/corrosion.patch new file mode 100644 index 000000000000..d8c8237aeba3 --- /dev/null +++ b/pkgs/by-name/in/intiface-central/corrosion.patch @@ -0,0 +1,23 @@ +diff --git a/linux/rust.cmake b/linux/rust.cmake +index a96586c..f9b8677 100644 +--- a/linux/rust.cmake ++++ b/linux/rust.cmake +@@ -2,17 +2,7 @@ + # many dependencies we would need to install Corrosion on the system. + # See instructions on https://github.com/AndrewGaspar/corrosion#cmake-install + # Once done, uncomment this line: +-# find_package(Corrosion REQUIRED) +- +-include(FetchContent) +- +-FetchContent_Declare( +- Corrosion +- GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git +- GIT_TAG origin/master # Optionally specify a version tag or branch here +-) +- +-FetchContent_MakeAvailable(Corrosion) ++find_package(Corrosion REQUIRED) + + corrosion_import_crate(MANIFEST_PATH ../intiface-engine-flutter-bridge/Cargo.toml) + diff --git a/pkgs/by-name/in/intiface-central/deps.json b/pkgs/by-name/in/intiface-central/deps.json new file mode 100644 index 000000000000..7f9ae104f35b --- /dev/null +++ b/pkgs/by-name/in/intiface-central/deps.json @@ -0,0 +1,1761 @@ +[ + { + "name": "intiface_central", + "version": "2.5.3+21", + "kind": "root", + "source": "root", + "dependencies": [ + "flutter", + "device_info_plus", + "cupertino_icons", + "json_annotation", + "flutter_local_notifications", + "flutter_rust_bridge", + "plugin_platform_interface", + "ffi", + "path_provider", + "path", + "window_manager", + "web_socket_channel", + "network_info_plus", + "permission_handler", + "bloc", + "flutter_bloc", + "equatable", + "shared_preferences", + "settings_ui", + "flutter_markdown", + "loggy", + "flutter_loggy", + "github", + "markdown", + "version", + "package_info_plus", + "url_launcher", + "intl", + "easy_debounce", + "percent_indicator", + "buttplug", + "flutter_foreground_task", + "tuple", + "sentry_flutter", + "sentry", + "rxdart", + "screen_retriever", + "flutter_test", + "json_serializable", + "build_runner", + "flutter_lints", + "ffigen", + "flutter_launcher_icons" + ] + }, + { + "name": "flutter_launcher_icons", + "version": "0.13.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "args", + "checked_yaml", + "cli_util", + "image", + "json_annotation", + "path", + "yaml" + ] + }, + { + "name": "yaml", + "version": "3.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner" + ] + }, + { + "name": "string_scanner", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span" + ] + }, + { + "name": "source_span", + "version": "1.10.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "path", + "term_glyph" + ] + }, + { + "name": "term_glyph", + "version": "1.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "path", + "version": "1.8.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "collection", + "version": "1.17.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "json_annotation", + "version": "4.8.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "meta", + "version": "1.9.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "image", + "version": "4.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "meta", + "xml" + ] + }, + { + "name": "xml", + "version": "6.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "petitparser" + ] + }, + { + "name": "petitparser", + "version": "5.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "archive", + "version": "3.4.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "typed_data", + "version": "1.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, + { + "name": "cli_util", + "version": "0.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "checked_yaml", + "version": "2.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation", + "source_span", + "yaml" + ] + }, + { + "name": "args", + "version": "2.4.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "ffigen", + "version": "9.0.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "ffi", + "yaml", + "path", + "quiver", + "args", + "logging", + "cli_util", + "glob", + "file", + "package_config", + "yaml_edit" + ] + }, + { + "name": "yaml_edit", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta", + "source_span", + "yaml" + ] + }, + { + "name": "package_config", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "file", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "glob", + "version": "2.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "file", + "path", + "string_scanner" + ] + }, + { + "name": "async", + "version": "2.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "quiver", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "matcher" + ] + }, + { + "name": "matcher", + "version": "0.12.16", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "meta", + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "stream_channel", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "stack_trace", + "version": "1.11.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" + ] + }, + { + "name": "ffi", + "version": "2.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_lints", + "version": "3.0.0", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "lints" + ] + }, + { + "name": "lints", + "version": "3.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner", + "version": "2.4.6", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "async", + "build", + "build_config", + "build_daemon", + "build_resolvers", + "build_runner_core", + "code_builder", + "collection", + "crypto", + "dart_style", + "frontend_server_client", + "glob", + "graphs", + "http_multi_server", + "io", + "js", + "logging", + "meta", + "mime", + "package_config", + "path", + "pool", + "pub_semver", + "pubspec_parse", + "shelf", + "shelf_web_socket", + "stack_trace", + "stream_transform", + "timing", + "watcher", + "web_socket_channel", + "yaml" + ] + }, + { + "name": "web_socket_channel", + "version": "2.4.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "async", + "crypto", + "stream_channel" + ] + }, + { + "name": "watcher", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "timing", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "json_annotation" + ] + }, + { + "name": "stream_transform", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shelf_web_socket", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "shelf", + "stream_channel", + "web_socket_channel" + ] + }, + { + "name": "shelf", + "version": "1.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "collection", + "http_parser", + "path", + "stack_trace", + "stream_channel" + ] + }, + { + "name": "http_parser", + "version": "4.0.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "source_span", + "string_scanner", + "typed_data" + ] + }, + { + "name": "pubspec_parse", + "version": "1.2.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "collection", + "json_annotation", + "pub_semver", + "yaml" + ] + }, + { + "name": "pub_semver", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "pool", + "version": "1.5.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "stack_trace" + ] + }, + { + "name": "mime", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "io", + "version": "1.0.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path", + "string_scanner" + ] + }, + { + "name": "http_multi_server", + "version": "3.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async" + ] + }, + { + "name": "graphs", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "frontend_server_client", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "path" + ] + }, + { + "name": "dart_style", + "version": "2.3.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "args", + "path", + "pub_semver", + "source_span" + ] + }, + { + "name": "analyzer", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "_fe_analyzer_shared", + "collection", + "convert", + "crypto", + "glob", + "meta", + "package_config", + "path", + "pub_semver", + "source_span", + "watcher", + "yaml" + ] + }, + { + "name": "_fe_analyzer_shared", + "version": "64.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "code_builder", + "version": "4.7.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "collection", + "matcher", + "meta" + ] + }, + { + "name": "built_value", + "version": "8.6.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "collection", + "fixnum", + "meta" + ] + }, + { + "name": "fixnum", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "built_collection", + "version": "5.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "build_runner_core", + "version": "7.2.11", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "build", + "build_config", + "build_resolvers", + "collection", + "convert", + "crypto", + "glob", + "graphs", + "json_annotation", + "logging", + "meta", + "package_config", + "path", + "pool", + "timing", + "watcher", + "yaml" + ] + }, + { + "name": "build_resolvers", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "collection", + "convert", + "crypto", + "graphs", + "logging", + "package_config", + "path", + "pool", + "pub_semver", + "stream_transform", + "yaml" + ] + }, + { + "name": "build", + "version": "2.4.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "convert", + "crypto", + "glob", + "logging", + "meta", + "package_config", + "path" + ] + }, + { + "name": "build_config", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "checked_yaml", + "json_annotation", + "path", + "pubspec_parse", + "yaml" + ] + }, + { + "name": "build_daemon", + "version": "4.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "built_collection", + "built_value", + "http_multi_server", + "logging", + "path", + "pool", + "shelf", + "shelf_web_socket", + "stream_transform", + "watcher", + "web_socket_channel" + ] + }, + { + "name": "json_serializable", + "version": "6.7.1", + "kind": "dev", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "build_config", + "collection", + "json_annotation", + "meta", + "path", + "pub_semver", + "pubspec_parse", + "source_gen", + "source_helper" + ] + }, + { + "name": "source_helper", + "version": "1.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "collection", + "source_gen" + ] + }, + { + "name": "source_gen", + "version": "1.4.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "analyzer", + "async", + "build", + "dart_style", + "glob", + "path", + "source_span", + "yaml" + ] + }, + { + "name": "flutter_test", + "version": "0.0.0", + "kind": "dev", + "source": "sdk", + "dependencies": [ + "flutter", + "test_api", + "matcher", + "path", + "fake_async", + "clock", + "stack_trace", + "vector_math", + "async", + "boolean_selector", + "characters", + "collection", + "material_color_utilities", + "meta", + "source_span", + "stream_channel", + "string_scanner", + "term_glyph", + "web" + ] + }, + { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "material_color_utilities", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection" + ] + }, + { + "name": "characters", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "vector_math", + "version": "2.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "clock", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "fake_async", + "version": "1.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "clock", + "collection" + ] + }, + { + "name": "flutter", + "version": "0.0.0", + "kind": "direct", + "source": "sdk", + "dependencies": [ + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web", + "sky_engine" + ] + }, + { + "name": "sky_engine", + "version": "0.0.99", + "kind": "transitive", + "source": "sdk", + "dependencies": [] + }, + { + "name": "screen_retriever", + "version": "0.1.9", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "rxdart", + "version": "0.27.7", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "sentry", + "version": "7.10.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "meta", + "stack_trace", + "uuid" + ] + }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, + { + "name": "http", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "http_parser", + "meta" + ] + }, + { + "name": "sentry_flutter", + "version": "7.10.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "sentry", + "package_info_plus", + "meta", + "ffi" + ] + }, + { + "name": "package_info_plus", + "version": "4.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "flutter_web_plugins", + "http", + "meta", + "path", + "package_info_plus_platform_interface", + "win32" + ] + }, + { + "name": "win32", + "version": "5.0.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi" + ] + }, + { + "name": "package_info_plus_platform_interface", + "version": "2.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "plugin_platform_interface", + "version": "2.1.6", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "flutter_web_plugins", + "version": "0.0.0", + "kind": "transitive", + "source": "sdk", + "dependencies": [ + "flutter", + "characters", + "collection", + "material_color_utilities", + "meta", + "vector_math", + "web" + ] + }, + { + "name": "tuple", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "flutter_foreground_task", + "version": "6.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "platform", + "shared_preferences" + ] + }, + { + "name": "shared_preferences", + "version": "2.2.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_android", + "shared_preferences_foundation", + "shared_preferences_linux", + "shared_preferences_platform_interface", + "shared_preferences_web", + "shared_preferences_windows" + ] + }, + { + "name": "shared_preferences_windows", + "version": "2.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_platform_interface", + "path_provider_windows", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_platform_interface", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "path_provider_windows", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "win32" + ] + }, + { + "name": "path_provider_platform_interface", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "platform", + "plugin_platform_interface" + ] + }, + { + "name": "platform", + "version": "3.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, + { + "name": "shared_preferences_web", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_linux", + "version": "2.3.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file", + "flutter", + "path", + "path_provider_linux", + "path_provider_platform_interface", + "shared_preferences_platform_interface" + ] + }, + { + "name": "path_provider_linux", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "flutter", + "path", + "path_provider_platform_interface", + "xdg_directories" + ] + }, + { + "name": "xdg_directories", + "version": "1.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta", + "path" + ] + }, + { + "name": "shared_preferences_foundation", + "version": "2.3.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "shared_preferences_android", + "version": "2.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "shared_preferences_platform_interface" + ] + }, + { + "name": "buttplug", + "version": "0.0.4", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "json_annotation", + "loggy", + "web_socket_channel" + ] + }, + { + "name": "loggy", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "stack_trace" + ] + }, + { + "name": "percent_indicator", + "version": "4.2.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "easy_debounce", + "version": "2.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "intl", + "version": "0.18.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "meta", + "path" + ] + }, + { + "name": "url_launcher", + "version": "6.1.14", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_android", + "url_launcher_ios", + "url_launcher_linux", + "url_launcher_macos", + "url_launcher_platform_interface", + "url_launcher_web", + "url_launcher_windows" + ] + }, + { + "name": "url_launcher_windows", + "version": "3.0.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_platform_interface", + "version": "2.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "url_launcher_web", + "version": "2.0.20", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_macos", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_linux", + "version": "3.0.6", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_ios", + "version": "6.1.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "url_launcher_android", + "version": "6.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "url_launcher_platform_interface" + ] + }, + { + "name": "version", + "version": "3.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "markdown", + "version": "7.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "github", + "version": "9.19.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "http", + "http_parser", + "json_annotation", + "meta" + ] + }, + { + "name": "flutter_loggy", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "loggy", + "rxdart" + ] + }, + { + "name": "flutter_markdown", + "version": "0.6.18", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "markdown", + "meta", + "path" + ] + }, + { + "name": "settings_ui", + "version": "2.0.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "equatable", + "version": "2.0.5", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "meta" + ] + }, + { + "name": "flutter_bloc", + "version": "8.1.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "bloc", + "flutter", + "provider" + ] + }, + { + "name": "provider", + "version": "6.0.5", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "flutter", + "nested" + ] + }, + { + "name": "nested", + "version": "1.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, + { + "name": "bloc", + "version": "8.1.2", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "permission_handler", + "version": "11.0.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "permission_handler_android", + "permission_handler_apple", + "permission_handler_windows", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_platform_interface", + "version": "3.12.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "permission_handler_windows", + "version": "0.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_apple", + "version": "9.1.4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "permission_handler_android", + "version": "11.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "permission_handler_platform_interface" + ] + }, + { + "name": "network_info_plus", + "version": "4.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "collection", + "nm", + "flutter", + "flutter_web_plugins", + "meta", + "network_info_plus_platform_interface", + "win32", + "ffi" + ] + }, + { + "name": "network_info_plus_platform_interface", + "version": "1.1.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, + { + "name": "nm", + "version": "0.5.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus" + ] + }, + { + "name": "dbus", + "version": "0.7.8", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "ffi", + "meta", + "xml" + ] + }, + { + "name": "window_manager", + "version": "0.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path", + "screen_retriever" + ] + }, + { + "name": "path_provider", + "version": "2.1.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_android", + "path_provider_foundation", + "path_provider_linux", + "path_provider_platform_interface", + "path_provider_windows" + ] + }, + { + "name": "path_provider_foundation", + "version": "2.3.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "path_provider_android", + "version": "2.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "path_provider_platform_interface" + ] + }, + { + "name": "flutter_rust_bridge", + "version": "1.82.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "args", + "build_cli_annotations", + "js", + "meta", + "path", + "puppeteer", + "shelf", + "shelf_static", + "shelf_web_socket", + "uuid", + "web_socket_channel", + "yaml", + "tuple" + ] + }, + { + "name": "shelf_static", + "version": "1.1.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "convert", + "http_parser", + "mime", + "path", + "shelf" + ] + }, + { + "name": "puppeteer", + "version": "3.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "archive", + "async", + "collection", + "http", + "logging", + "path", + "petitparser", + "pool" + ] + }, + { + "name": "build_cli_annotations", + "version": "2.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "args", + "meta" + ] + }, + { + "name": "flutter_local_notifications", + "version": "16.1.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "clock", + "flutter", + "flutter_local_notifications_linux", + "flutter_local_notifications_platform_interface", + "timezone" + ] + }, + { + "name": "timezone", + "version": "0.9.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "path" + ] + }, + { + "name": "flutter_local_notifications_platform_interface", + "version": "7.0.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "flutter_local_notifications_linux", + "version": "4.0.0+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "dbus", + "ffi", + "flutter", + "flutter_local_notifications_platform_interface", + "path", + "xdg_directories" + ] + }, + { + "name": "cupertino_icons", + "version": "1.0.6", + "kind": "direct", + "source": "hosted", + "dependencies": [] + }, + { + "name": "device_info_plus", + "version": "9.1.0", + "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.2", + "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" + ] + } +] diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix new file mode 100644 index 000000000000..2081e5c68856 --- /dev/null +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, flutter +, corrosion +, rustPlatform +, cargo +, rustc +, udev +, copyDesktopItems +, makeDesktopItem +}: +flutter.buildFlutterApplication rec { + pname = "intiface-central"; + version = "2.5.3"; + src = fetchFromGitHub { + owner = "intiface"; + repo = pname; + rev = "v${version}"; + hash = "sha256-i0G3wCfJ9Q7DEmVMrQv2K6fy4YRWsEMNns9zMZkJxvY="; + }; + patches = [ + ./corrosion.patch + ]; + + depsListFile = ./deps.json; + vendorHash = "sha256-06I9ugwUmMT16A6l5Is5v35Fu7pyE8+1mnDDPKxCYxM="; + + cargoDeps = rustPlatform.fetchCargoTarball { + name = "${pname}-${version}-cargo-deps"; + inherit src; + sourceRoot = "source/intiface-engine-flutter-bridge"; + hash = "sha256-0sCHa3rMaLYaUG3E3fmsLi0dSdb9vGyv7qNR3JQkXuU="; + }; + cargoRoot = "intiface-engine-flutter-bridge"; + + preConfigure = '' + export CMAKE_PREFIX_PATH="${corrosion}:$CMAKE_PREFIX_PATH" + ''; + + nativeBuildInputs = [ + corrosion + rustPlatform.cargoSetupHook + cargo + rustc + copyDesktopItems + ]; + + buildInputs = [ + udev + ]; + + # without this, only the splash screen will be shown and the logs will contain the + # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` + extraWrapProgramArgs = "--chdir $out/app"; + + postInstall = '' + mkdir -p $out/share/pixmaps + cp $out/app/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = "intiface-central"; + exec = "intiface_central"; + icon = "intiface-central"; + comment = "Intiface Central (Buttplug Frontend) Application for Desktop"; + desktopName = "Intiface Central"; + }) + ]; + + meta = with lib; { + mainProgram = "intiface_central"; + description = "Intiface Central (Buttplug Frontend) Application for Desktop"; + homepage = "https://intiface.com/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ _999eagle ]; + platforms = platforms.linux; + }; +} From e3c52566dbe401ed66205d0d59ac3db6a6b24b30 Mon Sep 17 00:00:00 2001 From: Alvin Shen <29553973+asian-dev@users.noreply.github.com> Date: Sat, 2 Dec 2023 11:05:53 -0500 Subject: [PATCH 002/153] pest-ide-tools: fix package not building on Darwin Security framework is needed to properly compile and link on MacOS --- pkgs/development/tools/misc/pest-ide-tools/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/pest-ide-tools/default.nix b/pkgs/development/tools/misc/pest-ide-tools/default.nix index 3398810dace4..162817c68357 100644 --- a/pkgs/development/tools/misc/pest-ide-tools/default.nix +++ b/pkgs/development/tools/misc/pest-ide-tools/default.nix @@ -1,9 +1,11 @@ { lib +, stdenv , fetchFromGitHub , rustPlatform , nix-update-script , pkg-config , openssl +, darwin }: rustPlatform.buildRustPackage rec { @@ -18,7 +20,11 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-SymtMdj7QVOEiSeTjmVidejFeGK8swnM6nfT7u18URs="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; passthru = { updateScript = nix-update-script { }; From b5ac5c9612f2c21661c2f4ad536762754a5c8756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 4 Dec 2023 08:18:21 -0800 Subject: [PATCH 003/153] libsForQt5.mauiPackages: 3.0.1 -> 3.0.2 --- pkgs/applications/maui/srcs.nix | 192 ++++++++++++++++---------------- 1 file changed, 96 insertions(+), 96 deletions(-) diff --git a/pkgs/applications/maui/srcs.nix b/pkgs/applications/maui/srcs.nix index 6473b9607bfd..7de3325e4d96 100644 --- a/pkgs/applications/maui/srcs.nix +++ b/pkgs/applications/maui/srcs.nix @@ -4,59 +4,59 @@ { agenda = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; - sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; - name = "agenda-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.2/agenda-0.5.2.tar.xz"; + sha256 = "160y0pq3mj72wxyfnnl45488j4kpl26xpf83vlnfshiwvc6c0m3y"; + name = "agenda-0.5.2.tar.xz"; }; }; arca = { - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; - sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; - name = "arca-0.5.1.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.2/arca-0.5.2.tar.xz"; + sha256 = "0l0x24m55hc20yc40yjj0zx910yzh31qn911swdli39iy4c6mxk2"; + name = "arca-0.5.2.tar.xz"; }; }; bonsai = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/bonsai/1.0.0/bonsai-2.2.0.tar.xz"; - sha256 = "0gpqdj30brqv9nsiis93w9lad4xn7d301gxncj04pcpybmbksg4r"; - name = "bonsai-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/bonsai/1.1.2/bonsai-1.1.2.tar.xz"; + sha256 = "0nzp0ixxap3q1llv42l71rygxv98hvcmqwqdw7690w650hja7zvj"; + name = "bonsai-1.1.2.tar.xz"; }; }; booth = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; - sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; - name = "booth-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.2/booth-1.1.2.tar.xz"; + sha256 = "06gg4zgpn8arnzmi54x7xbdg5wyc3a86v9z5x6y101imh6cwbhyw"; + name = "booth-1.1.2.tar.xz"; }; }; buho = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; - sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; - name = "buho-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.2/buho-3.0.2.tar.xz"; + sha256 = "0sllffddngzxc2wi2wszjxzb75rca0a42bdylm7pxmr5p8mafn1l"; + name = "buho-3.0.2.tar.xz"; }; }; clip = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; - sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; - name = "clip-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.2/clip-3.0.2.tar.xz"; + sha256 = "0pjqk1l1cwkvwrlv1lb113cl8kggppxqhdsild83wrzbfqx9nrva"; + name = "clip-3.0.2.tar.xz"; }; }; communicator = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; - sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; - name = "communicator-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.2/communicator-3.0.2.tar.xz"; + sha256 = "0hmapwsgrlaiwvprpmllfy943w0sclnk4vg7sb6rys1i96f3yz6r"; + name = "communicator-3.0.2.tar.xz"; }; }; era = { @@ -68,139 +68,139 @@ }; }; fiery = { - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; - sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; - name = "fiery-1.1.1.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.2/fiery-1.1.2.tar.xz"; + sha256 = "0ba3bxhvfzkpwrrnfyhbvprlhdv2vmgmi41lpq2pian0d3nkc05s"; + name = "fiery-1.1.2.tar.xz"; }; }; index-fm = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.1/index-fm-3.0.1.tar.xz"; - sha256 = "046in0bqblpqcxp4rz417pjpy1m57p611wlzdsw8hp4dl1l2qmn9"; - name = "index-fm-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/index/3.0.2/index-fm-3.0.2.tar.xz"; + sha256 = "08ncjliqzx71scmfxl3h24w9s8dgrp6gd7nf6pczyn5arqf96d81"; + name = "index-fm-3.0.2.tar.xz"; }; }; mauikit = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; - sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; - name = "mauikit-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.2/mauikit-3.0.2.tar.xz"; + sha256 = "19317xfbyy3cg9nm1dqknvypsj9kq8phz36srwvwfyxd26kaqs2s"; + name = "mauikit-3.0.2.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.1/mauikit-accounts-3.0.1.tar.xz"; - sha256 = "1b6nmnh5fh6gis7r56s41204g9y7cp5g2qmsk0r6b3a3x0ndwmqj"; - name = "mauikit-accounts-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.2/mauikit-accounts-3.0.2.tar.xz"; + sha256 = "1h876vz9vfyl44pryhf5s4lkzik00zwhjvyrv7f4b1zwjz3xbqai"; + name = "mauikit-accounts-3.0.2.tar.xz"; }; }; mauikit-calendar = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/3.0.1/mauikit-calendar-3.0.1.tar.xz"; - sha256 = "1s95nkbyc4k8999hsnr5aw80qhr66q4z51wq2ail3h0df7p1f700"; - name = "mauikit-calendar-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.2/mauikit-calendar-3.0.2.tar.xz"; + sha256 = "098d2alw1dnhpqwkdy0wrl6cvanyb6vg8qy5aqmgmsk0hil1s8x1"; + name = "mauikit-calendar-3.0.2.tar.xz"; }; }; mauikit-documents = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/3.0.1/mauikit-documents-3.0.1.tar.xz"; - sha256 = "1w2dszggxbqla5ab3739l1j79l2qa3br8drvkidivir8vwxifj3v"; - name = "mauikit-documents-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.2/mauikit-documents-3.0.2.tar.xz"; + sha256 = "1ln8nk6n2wcqdjd4l5pzam9291rx52mal7rdxs06f6fwszwifhyr"; + name = "mauikit-documents-3.0.2.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.1/mauikit-filebrowsing-3.0.1.tar.xz"; - sha256 = "0z8070p1m2c2mv3xdhsz4scnasbwxf698mql0svqzmjiy8vjfnn2"; - name = "mauikit-filebrowsing-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.2/mauikit-filebrowsing-3.0.2.tar.xz"; + sha256 = "03dcmpw8l19mziswhhsvyiiid07qx0c4ddh8986llsz6xngdnlib"; + name = "mauikit-filebrowsing-3.0.2.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.1/mauikit-imagetools-3.0.1.tar.xz"; - sha256 = "0aayhmmk6bd3n5p1mgm9k1jycsw8li5fs1xq7x42h93zhvxcw1va"; - name = "mauikit-imagetools-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.2/mauikit-imagetools-3.0.2.tar.xz"; + sha256 = "1xryms7mc3lq8p67m2h3cxffyd9dk8m738ap30aq9ym62qq76psl"; + name = "mauikit-imagetools-3.0.2.tar.xz"; }; }; mauikit-terminal = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/3.0.1/mauikit-terminal-3.0.1.tar.xz"; - sha256 = "1w7d04cdq2b4mkjl7ngj1v580dlhrpvr1n0gy5jcfv6x4ia3g8k3"; - name = "mauikit-terminal-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.2/mauikit-terminal-3.0.2.tar.xz"; + sha256 = "0abywv56ljxbmsi5y3x9agbgbhvscnkznja9adwjj073pavvaf1g"; + name = "mauikit-terminal-3.0.2.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.1/mauikit-texteditor-3.0.1.tar.xz"; - sha256 = "063zxzc530zgamr6fm5brm2rqpmq4rx4wsq7cx7sxfgyknag52m6"; - name = "mauikit-texteditor-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.2/mauikit-texteditor-3.0.2.tar.xz"; + sha256 = "09wdvjy8c0b5lka0fj28kl99w5y3w0nvz2mnr3ic5kn825ay1wmy"; + name = "mauikit-texteditor-3.0.2.tar.xz"; }; }; mauiman = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; - sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; - name = "mauiman-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.2/mauiman-3.0.2.tar.xz"; + sha256 = "0aqzgdkcs6cdlsbsyiyhadambcwwa0xj2q2yj5hv5d42q25ibfs1"; + name = "mauiman-3.0.2.tar.xz"; }; }; nota = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; - sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; - name = "nota-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.2/nota-3.0.2.tar.xz"; + sha256 = "11lqdxwsdvf1vz9y1d9r38vxfsz4jfnin3c1ipsvjl0f0zn1glr6"; + name = "nota-3.0.2.tar.xz"; }; }; pix = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; - sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; - name = "pix-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.2/pix-3.0.2.tar.xz"; + sha256 = "0wlpqqbf4j7dlylxhfixrcjz0yz9csni4vnbqv9l5vkxxwf0mq4k"; + name = "pix-3.0.2.tar.xz"; }; }; shelf = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; - sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; - name = "shelf-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.2/shelf-3.0.2.tar.xz"; + sha256 = "1x27grdn9qa7ysxh4fb35h5376crpbl39vpd6hn0a7c3fk74w95q"; + name = "shelf-3.0.2.tar.xz"; }; }; station = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; - sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; - name = "station-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.2/station-3.0.2.tar.xz"; + sha256 = "14i4z5lkj2rg7p5nkglqpzvrrxmf7b07kf49hh1jdk08753abc76"; + name = "station-3.0.2.tar.xz"; }; }; strike = { - version = "2.2.0"; + version = "1.1.2"; src = fetchurl { - url = "${mirror}/stable/maui/strike/1.0.0/strike-2.2.0.tar.xz"; - sha256 = "159l1i0mi3q5avcg45aq5ixz8wjfryhip61h9gynxr1m77qdpfnc"; - name = "strike-2.2.0.tar.xz"; + url = "${mirror}/stable/maui/strike/1.1.2/strike-1.1.2.tar.xz"; + sha256 = "01ak3h6n0z3l346nbzfabkgbzwbx1fm3l9g7myiip4518cb2n559"; + name = "strike-1.1.2.tar.xz"; }; }; vvave = { - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; - sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; - name = "vvave-3.0.1.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.2/vvave-3.0.2.tar.xz"; + sha256 = "1py46ryi57757wyqfvxc2h02x33n11g1v04f0hac0zkjilp5l21k"; + name = "vvave-3.0.2.tar.xz"; }; }; } From 0d84d1878037ee12ddd66f2faaf54da89702fb30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Dec 2023 06:42:26 +0000 Subject: [PATCH 004/153] dsdcc: 1.9.4 -> 1.9.5 --- pkgs/development/libraries/dsdcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index e97b36c033ff..a64ddd94e505 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dsdcc"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "dsdcc"; rev = "v${version}"; - sha256 = "sha256-EsjmU0LQOXnOoTFrnn63hAbvqbE6NVlSQTngot5Zuf4="; + sha256 = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; }; nativeBuildInputs = [ cmake pkg-config ]; From 1530d9b60dd30ac38a0a906239e4aef6c9d1f634 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Dec 2023 07:03:14 +0000 Subject: [PATCH 005/153] fasm: 1.73.31 -> 1.73.32 --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index e894d2607bc0..d33017517d2c 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.31"; + version = "1.73.32"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-jzjLIayR+xulSGKhvQ9VxWhZC6qRZ/4IHSe3lD8LD+M="; + sha256 = "sha256-WVXL4UNWXa9e7K3MSS0CXK3lczgog9V4XUoYChvvym8="; }; installPhase = '' From 3a6b8cd838c7e3e124c3672a367a3314af919b9a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 5 Dec 2023 10:00:26 +0100 Subject: [PATCH 006/153] guile_3_0: remove inactive maintainers --- pkgs/development/interpreters/guile/3.0.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix index a09afadf5271..33cd9e22be86 100644 --- a/pkgs/development/interpreters/guile/3.0.nix +++ b/pkgs/development/interpreters/guile/3.0.nix @@ -163,7 +163,7 @@ builder rec { foreign function call interface, and powerful string processing. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ ludo lovek323 vrthra ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } From 2e38c42cbb60da4446e82b13dafe393fab031c8c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 5 Dec 2023 08:34:06 +0000 Subject: [PATCH 007/153] vlang: weekly.2023.44 -> 0.4.3 --- pkgs/development/compilers/vlang/default.nix | 27 +++++++------------- 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 2a8ea72b9f5b..66b871559057 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,20 +1,21 @@ { lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, boehmgc, xorg, binaryen, darwin }: let - version = "weekly.2023.44"; + version = "0.4.3"; ptraceSubstitution = '' #include #include ''; - # Required for bootstrap. + # vc is the V compiler's source translated to C (needed for boostrap). + # So we fix its rev to correspond to the V version. vc = stdenv.mkDerivation { pname = "v.c"; - version = "unstable-2023-10-30"; + version = "0.4.3"; src = fetchFromGitHub { owner = "vlang"; repo = "vc"; - rev = "66b89ab916c13c5781753797d1f4ff08e427bb6b"; - hash = "sha256-5Y7/rlcoIHjbf79A1rqFysNFc5+p6CY09MRPQalo7Ak="; + rev = "5e691a82c01957870b451e06216a9fb3a4e83a18"; + hash = "sha256-Ti2b88NDG1pppj34BeK8+UsT2HiG/jcAF2mHgiBBRaI="; }; # patch the ptrace reference for darwin @@ -30,8 +31,8 @@ let markdown = fetchFromGitHub { owner = "vlang"; repo = "markdown"; - rev = "61c47ea0a6c0c79e973a119dcbab3b8fdd0973ca"; - hash = "sha256-XBD30Pc9CGXzU1Gy6U0pDpTozYVwfgAvZRjIsnXp8ZM="; + rev = "0c280130cb7ec410b7d21810d1247956c15b72fc"; + hash = "sha256-Fmhkrg9DBiWxInostNp+WfA3V5GgEIs5+KIYrqZosqY="; }; boehmgcStatic = boehmgc.override { enableStatic = true; @@ -45,7 +46,7 @@ stdenv.mkDerivation { owner = "vlang"; repo = "v"; rev = version; - hash = "sha256-1yFuheSyKfvm4GqKIbXycdzKx3XcD9LSmmuKlcJmteg="; + hash = "sha256-ZFBQD7SP38VnEMoOnwr/n8zZuLtR7GR3OCYhvfz3apI="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -76,11 +77,6 @@ stdenv.mkDerivation { cp -r ${boehmgcStatic}/lib/* ./thirdparty/tcc/lib ''; - # vcreate_test.v requires git, so we must remove it when building the tools. - preInstall = '' - mv cmd/tools/vcreate/vcreate_test.v $HOME/vcreate_test.v - ''; - installPhase = '' runHook preInstall @@ -102,11 +98,6 @@ stdenv.mkDerivation { runHook postInstall ''; - # Return vcreate_test.v and vtest.v, so the user can use it. - postInstall = '' - cp $HOME/vcreate_test.v $out/lib/cmd/tools/vcreate_test.v - ''; - meta = with lib; { homepage = "https://vlang.io/"; description = "Simple, fast, safe, compiled language for developing maintainable software"; From f59d1cf6d6494900826bf80fa6dd7547d51e75d3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 6 Dec 2023 11:46:24 +0100 Subject: [PATCH 008/153] build-support/php: prevent the creation of symlinks of `bin` ending with `.bat` --- pkgs/build-support/php/hooks/composer-install-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/php/hooks/composer-install-hook.sh b/pkgs/build-support/php/hooks/composer-install-hook.sh index 6fe1c4e5f7dd..6e7fb5d7503b 100644 --- a/pkgs/build-support/php/hooks/composer-install-hook.sh +++ b/pkgs/build-support/php/hooks/composer-install-hook.sh @@ -155,7 +155,7 @@ composerInstallInstallHook() { cp -r . "$out"/share/php/"${pname}"/ # Create symlinks for the binaries. - jq -r -c 'try .bin[]' composer.json | while read -r bin; do + jq -r -c 'try (.bin[] | select(test(".bat$")? | not) )' composer.json | while read -r bin; do mkdir -p "$out"/share/php/"${pname}" "$out"/bin makeWrapper "$out"/share/php/"${pname}"/"$bin" "$out"/bin/"$(basename "$bin")" done From 73f47900fa9ed8ede153fdafbda166ea3c228f9d Mon Sep 17 00:00:00 2001 From: eureka-cpu Date: Thu, 7 Dec 2023 11:17:25 +0300 Subject: [PATCH 009/153] maintainers: add euraka-cpu --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 85a1d4c52364..7d17d042f304 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5457,6 +5457,12 @@ githubId = 2147649; name = "Euan Kemp"; }; + eureka-cpu = { + email = "github.eureka@gmail.com"; + github = "eureka-cpu"; + githubId = 57543709; + name = "Chris O'Brien"; + }; evalexpr = { name = "Jonathan Wilkins"; email = "nixos@wilkins.tech"; From f11fd28ab4672700e004ebec03127506d1c41047 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Dec 2023 12:27:40 +0000 Subject: [PATCH 010/153] rtx: 2023.11.2 -> 2023.12.18 --- pkgs/tools/misc/rtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix index 51cba8e4b375..80469864d361 100644 --- a/pkgs/tools/misc/rtx/default.nix +++ b/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.11.2"; + version = "2023.12.18"; src = fetchFromGitHub { owner = "jdx"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; + hash = "sha256-RjILdhH0Gg9VRvyVFukUrreYHnwtC+5MfXT+v4cT7/Y="; }; - cargoHash = "sha256-KOte3zmJllrMp6OaKuFtUsRjdRKlSAxdJp1iJEOPcF0="; + cargoHash = "sha256-1/Te4JfPDE0gbMysnQbF2SH/oMq+b3fyVgIHaQx1m5E="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From 983effd86a873e5fc4a370829e9f27ad52b2e552 Mon Sep 17 00:00:00 2001 From: eureka-cpu Date: Tue, 7 Nov 2023 23:44:36 -0600 Subject: [PATCH 011/153] gruvbox-plus-icon-pack: init at unstable-2023-11-07 --- .../by-name/gr/gruvbox-plus-icons/package.nix | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/gr/gruvbox-plus-icons/package.nix diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix new file mode 100644 index 000000000000..ffcd8b3f0b89 --- /dev/null +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -0,0 +1,47 @@ +{ + lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, breeze-icons +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenvNoCC.mkDerivation { + pname = "gruvbox-plus-icons"; + version = "unstable-2023-12-07"; + + src = fetchFromGitHub { + owner = "SylEleuth"; + repo = "gruvbox-plus-icon-pack"; + rev = "f3109979fe93b31ea14eb2d5c04247a895302ea0"; + sha256 = "sha256-EijTEDkPmcDcMhCuL6fOWjU9eXFUwmeOEwfGlxadb1U="; + }; + + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ breeze-icons gnome-icon-theme hicolor-icon-theme ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + cp -r Gruvbox-Plus-Dark $out/share/icons/ + gtk-update-icon-cache $out/share/icons/Gruvbox-Plus-Dark + + runHook postInstall + ''; + + dontDropIconThemeCache = true; + dontBuild = true; + dontConfigure = true; + + meta = with lib; { + description = "Icon pack for Linux desktops based on the Gruvbox color scheme"; + homepage = "https://github.com/SylEleuth/gruvbox-plus-icon-pack"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ eureka-cpu RGBCube ]; + }; +} From d7665fd14defbd047ddb9879c2f320ff2fee8c97 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Fri, 8 Dec 2023 09:08:03 +0800 Subject: [PATCH 012/153] tdlib: 1.8.21 -> 1.8.22 --- pkgs/development/libraries/tdlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tdlib/default.nix b/pkgs/development/libraries/tdlib/default.nix index 575aef5ba4f3..f1c1c85caf0b 100644 --- a/pkgs/development/libraries/tdlib/default.nix +++ b/pkgs/development/libraries/tdlib/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "tdlib"; - version = "1.8.21"; + version = "1.8.22"; src = fetchFromGitHub { owner = "tdlib"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # The tdlib authors do not set tags for minor versions, but # external programs depending on tdlib constrain the minor # version, hence we set a specific commit with a known version. - rev = "3870c29b158b75ca5e48e0eebd6b5c3a7994a000"; - hash = "sha256-MCzgovcEZa34ZkwbbwfXHm2qitHwL2Tpr8p7+PxNhYk="; + rev = "24893faf75d84b2b885f3f7aeb9d5a3c056fa7be"; + hash = "sha256-4cfnre71+rQSuPrtFJMzIEPYVCZH/W142b4Pn2NxvqI="; }; buildInputs = [ gperf openssl readline zlib ]; From 236bcc73154eca6a64039ffc7314c3fe620852d7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 2 Dec 2023 12:14:48 -0500 Subject: [PATCH 013/153] nbd: format with nixpkgs-fmt --- pkgs/tools/networking/nbd/default.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index e0efbe31f8eb..f326d24e510f 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, which +, bison +, nixosTests +, linuxHeaders +, gnutls +}: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,10 +19,18 @@ stdenv.mkDerivation rec { hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo="; }; - buildInputs = [ glib gnutls ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; + nativeBuildInputs = [ + pkg-config + which + bison + ]; - nativeBuildInputs = [ pkg-config which bison ]; + buildInputs = [ + glib + gnutls + ] ++ lib.optionals stdenv.isLinux [ + linuxHeaders + ]; postInstall = '' mkdir -p "$out/share/doc/nbd-${version}" From 268b144407ffcbd8e584364fe269a36b1a6de963 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 2 Dec 2023 12:20:09 -0500 Subject: [PATCH 014/153] nbd: add nickcao to maintainers --- pkgs/tools/networking/nbd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index f326d24e510f..cf9da8bbac33 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nickcao ]; }; } From 8c124f6e1e9b0ef4ccec68e371a84b537984d1bd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 2 Dec 2023 12:23:15 -0500 Subject: [PATCH 015/153] nbd: add missing libnl dependency --- pkgs/tools/networking/nbd/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index cf9da8bbac33..c3e714bde84c 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -6,6 +6,7 @@ , which , bison , nixosTests +, libnl , linuxHeaders , gnutls }: @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { glib gnutls ] ++ lib.optionals stdenv.isLinux [ + libnl linuxHeaders ]; From 52f1d9b03ae38126e7f648634fcad35897f464ed Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 7 Dec 2023 21:23:31 -0500 Subject: [PATCH 016/153] nbd: set sysconfdir to /etc --- pkgs/tools/networking/nbd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index c3e714bde84c..d18ee47dff65 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { linuxHeaders ]; + configureFlags = [ + "--sysconfdir=/etc" + ]; + postInstall = '' mkdir -p "$out/share/doc/nbd-${version}" cp README.md "$out/share/doc/nbd-${version}/" From d12f11bbb1b9b49b5deb8447062ce03eb36ccbfa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 7 Dec 2023 21:23:47 -0500 Subject: [PATCH 017/153] nbd: drop ad-hoc copying of readme, the manpages already cover everything --- pkgs/tools/networking/nbd/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index d18ee47dff65..c7cb5632dfe4 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" ]; - postInstall = '' - mkdir -p "$out/share/doc/nbd-${version}" - cp README.md "$out/share/doc/nbd-${version}/" - ''; - doCheck = !stdenv.isDarwin; passthru.tests = { From 697c460ce4dd09f15e9c99801125c7ea2cffb543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Dec 2023 06:25:02 +0000 Subject: [PATCH 018/153] nsd: 4.7.0 -> 4.8.0 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index aa995a9f4843..1f82bde0384c 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-j6ykTima0pFfoACIerFjJjHqaHCcYs418RC/5yHs8hQ="; + sha256 = "sha256-gg2k44RyGRX0vK9/K+2YUZ2lY8bkwTDHQsckdg7AKgo="; }; prePatch = '' From 2275ffd75d61ec5312ce20fe0233d4dac7dd9de6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Dec 2023 08:00:32 +0000 Subject: [PATCH 019/153] subnetcalc: 2.4.22 -> 2.4.23 --- pkgs/tools/networking/subnetcalc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index b5aa064f7390..18837785614a 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "subnetcalc"; - version = "2.4.22"; + version = "2.4.23"; src = fetchFromGitHub { owner = "dreibh"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-5sDEMS4RgHdGQZAT2MVF/Ls0KXwdKzX+05uQpHhCZn8="; + sha256 = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; }; nativeBuildInputs = [ cmake ninja ]; From ebd96e0c7d4040eb480874532dcfc96ea9410763 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sat, 9 Dec 2023 08:26:11 +0100 Subject: [PATCH 020/153] broot: 1.29.0 -> 1.30.0 https://github.com/Canop/broot/releases/tag/v1.30.0 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index afa31e2feaf1..a540a0c7d495 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-Wx+hUm0y7w0+IYtaRE5X/5Ra37mMEMEliYFbl7c03Ww="; + hash = "sha256-2uHsmxD0pn39DvESdVzm0qHEvpmMpE2GD1R3p7XMJEI="; }; - cargoHash = "sha256-7B5Uxr1SsAx+mRpvQPSW7pemxp11WngEIK6vF2cbzh4="; + cargoHash = "sha256-3UW1zSklxi4Ot3h7N8sEevYJMQydkxW9lPcfUouDSy8="; nativeBuildInputs = [ installShellFiles From 5d66497260d67c0392c0e6c9a09c6fe8ac10d43a Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:00:51 +0000 Subject: [PATCH 021/153] =?UTF-8?q?memtree:=20unstable-2023-11-04=20?= =?UTF-8?q?=E2=86=92=202023-11-22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/me/memtree/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 2165b46e2b48..7f7d650c422d 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication { pname = "memtree"; - version = "unstable-2023-11-04"; + version = "unstable-2023-11-22"; pyproject = true; src = fetchFromGitHub { owner = "nbraud"; repo = "memtree"; - rev = "093caeef26ee944b5bf4408710f63494e442b5ff"; - hash = "sha256-j4LqWy7DxeV7pjwnCfpkHwug4p48kux6BM6oDJmvuUo="; + rev = "edc09d91dcd72f175d6adc1d08b261dd95cc4fbf"; + hash = "sha256-YLZm0wjkjaTw/lHY5k4cqPXCgINe+49SGPLZq+eRdI4="; }; nativeBuildInputs = with python3Packages; [ From 1b46ab02fd39ffcf3316b2e9fbc46948e3b6a903 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:04:13 +0000 Subject: [PATCH 022/153] memtree: Replace custom `checkPhase` with `pytestCheckHook` --- pkgs/by-name/me/memtree/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 7f7d650c422d..bc82a9063dcf 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -18,6 +18,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = with python3Packages; [ poetry-core + pytestCheckHook ]; propagatedBuildInputs = with python3Packages; [ @@ -29,12 +30,7 @@ python3Packages.buildPythonApplication { pytest ]; - checkPhase = '' - runHook preCheck - python -m pytest -v - runHook postCheck - ''; - + pytestFlagsArray = [ "-v" ]; pythonImportChecks = [ "memtree" ]; passthru.updateScript = nix-update-script { From 4c3cb337881549b2b4464b7c1bb0827d61bd2789 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 14:09:03 +0000 Subject: [PATCH 023/153] memtree: Add missing `mainProgram` metadata --- pkgs/by-name/me/memtree/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index bc82a9063dcf..68e990456e75 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -41,6 +41,7 @@ python3Packages.buildPythonApplication { description = "Render cgroups tree annotated by memory usage"; homepage = "https://github.com/nbraud/memtree"; maintainers = with maintainers; [ nicoo ]; + mainProgram = "memtree"; platforms = platforms.linux; }; } From b978927dcd6d3bc39be572d5ea5003cb6c6066ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Dec 2023 17:45:39 +0000 Subject: [PATCH 024/153] vtm: 0.9.16 -> 0.9.27 --- pkgs/tools/misc/vtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index ee7b301df861..e56d79bb0c0e 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.16"; + version = "0.9.27"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-nX7T3TAGgxAB65X8D2HlI+3T6p7aH3bwG3N1pScX/4g="; + sha256 = "sha256-BiXKwFZDi0boE1kCqbIn6uFjQ/oliyNbqmamyAwnqdM="; }; nativeBuildInputs = [ cmake ]; From cdc6ed5c2669bfd7d419091677f0cdb4cb6b097d Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 18:00:22 +0000 Subject: [PATCH 025/153] mpvScripts.cutter: simplify with `buildLua` --- pkgs/applications/video/mpv/scripts/cutter.nix | 16 ++++++---------- pkgs/applications/video/mpv/scripts/default.nix | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index 498fcb530a41..cf5d9830abde 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -1,6 +1,6 @@ -{ lib, stdenvNoCC, fetchFromGitHub, makeWrapper }: +{ lib, buildLua, fetchFromGitHub, makeWrapper }: -stdenvNoCC.mkDerivation { +buildLua { pname = "video-cutter"; version = "unstable-2021-02-03"; @@ -11,9 +11,6 @@ stdenvNoCC.mkDerivation { sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY="; }; - dontBuild = true; - dontCheck = true; - nativeBuildInputs = [ makeWrapper ]; postPatch = '' @@ -27,16 +24,15 @@ stdenvNoCC.mkDerivation { --replace '~/.config/mpv/scripts' "''${XDG_CONFIG_HOME:-~/.config}/mpv/cutter" ''; - installPhase = '' - install -Dm755 c_concat.sh $out/share/mpv/scripts/c_concat.sh - install cutter.lua $out/share/mpv/scripts/cutter.lua + passthru.scriptName = "cutter.lua"; + extraScripts = [ "c_concat.sh" ]; + postInstall = '' + chmod 0755 $out/share/mpv/scripts/c_concat.sh wrapProgram $out/share/mpv/scripts/c_concat.sh \ --run "mkdir -p ~/.config/mpv/cutter/" ''; - passthru.scriptName = "cutter.lua"; - meta = with lib; { description = "Cut videos and concat them automatically"; homepage = "https://github.com/rushmj/mpv-video-cutter"; diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index fb75464ab98e..e14e7f762dcf 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -12,6 +12,7 @@ in lib.recurseIntoAttrs autoload = callPackage ./autoload.nix { }; chapterskip = callPackage ./chapterskip.nix { inherit buildLua; }; convert = callPackage ./convert.nix { inherit buildLua; }; + cutter = callPackage ./cutter.nix { inherit buildLua; }; inhibit-gnome = callPackage ./inhibit-gnome.nix { }; mpris = callPackage ./mpris.nix { }; mpv-playlistmanager = callPackage ./mpv-playlistmanager.nix { inherit buildLua; }; @@ -26,7 +27,6 @@ in lib.recurseIntoAttrs visualizer = callPackage ./visualizer.nix { }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; - cutter = callPackage ./cutter.nix { }; } // (callPackage ./occivink.nix { inherit buildLua; })) // lib.optionalAttrs config.allowAliases { From 89e75ee87a5bdf4f25669f2fdc697f56d5410b9b Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 18:04:55 +0000 Subject: [PATCH 026/153] =?UTF-8?q?mpvScripts.cutter:=20unstable-2021-02-0?= =?UTF-8?q?3=20=E2=86=92=202023-11-09?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - resolve conflict with default shortcuts - license under MIT terms --- pkgs/applications/video/mpv/scripts/cutter.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/cutter.nix b/pkgs/applications/video/mpv/scripts/cutter.nix index cf5d9830abde..4c385b766c78 100644 --- a/pkgs/applications/video/mpv/scripts/cutter.nix +++ b/pkgs/applications/video/mpv/scripts/cutter.nix @@ -2,13 +2,13 @@ buildLua { pname = "video-cutter"; - version = "unstable-2021-02-03"; + version = "unstable-2023-11-09"; src = fetchFromGitHub { owner = "rushmj"; repo = "mpv-video-cutter"; - rev = "718d6ce9356e63fdd47208ec44f575a212b9068a"; - sha256 = "sha256-ramID1DPl0UqEzevpqdYKb9aaW3CAy3Dy9CPb/oJ4eY="; + rev = "01a0396c075d5f8bbd1de5b571e6231f8899ab65"; + sha256 = "sha256-veoRFzUCRH8TrvR7x+WWoycpDyxqrJZ/bnp61dVc0pE="; }; nativeBuildInputs = [ makeWrapper ]; @@ -36,8 +36,7 @@ buildLua { meta = with lib; { description = "Cut videos and concat them automatically"; homepage = "https://github.com/rushmj/mpv-video-cutter"; - # repo doesn't have a license - license = licenses.unfree; + license = licenses.mit; maintainers = with maintainers; [ lom ]; }; } From ab2df8282fc5a565726b936f236e8bbbf3703807 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 21:02:48 +0000 Subject: [PATCH 027/153] =?UTF-8?q?mpvScripts.thumbfast:=20unstable-2023-0?= =?UTF-8?q?6-04=20=E2=86=92=202023-12-08?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts/thumbfast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index 0226074ca31b..ad0c2d574807 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -2,13 +2,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "unstable-2023-06-04"; + version = "unstable-2023-12-08"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "4241c7daa444d3859b51b65a39d30e922adb87e9"; - hash = "sha256-7EnFJVjEzqhWXAvhzURoOp/kad6WzwyidWxug6u8lVw="; + rev = "03e93feee5a85bf7c65db953ada41b4826e9f905"; + hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; postPatch = '' From de5adfc28509f3f383af56c045611af1fd220330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Dec 2023 12:27:21 -0800 Subject: [PATCH 028/153] qutebrowser: 3.0.2 -> 3.1.0 Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.0.2...v3.1.0 Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.1.0/doc/changelog.asciidoc --- .../networking/browsers/qutebrowser/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index c8b315893a52..62465e5efd2f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -18,15 +18,15 @@ let isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let - version = "3.9.179"; + version = "4.0.269"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-QoJFb7MlZN6lDe2Yalsd10sseukL6+tNRi6JzLPVBYw="; + hash = "sha256-8gwJUxygcdvERDni/k6WIx3tzk7yb+qHZ4NsfkP0VDo="; stripRoot = false; }; - version = "3.0.2"; + version = "3.1.0"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-pRiT3koSNRmvuDcjuc7SstmPTKUoUnjIHpvdqR7VvFE="; + hash = "sha256-UA3MHMoI1rC4FPowbiII4lM1rL4OLPmZ+1GRbg9LLl8="; }; # Needs tox @@ -117,6 +117,7 @@ python3.pkgs.buildPythonApplication { --set-default QSG_RHI_BACKEND vulkan ''} ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''} + --set QTWEBENGINE_RESOURCES_PATH "${qtwebengine}/resources" ) ''; From 41fe0777299eb131745747323241b2085569184b Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 21:09:09 +0000 Subject: [PATCH 029/153] mpvScripts.thumbfast: bring `mpv` in `PATH` instead of patching its path in This should be more robust against upstream changes, and does not require a rebuild after every mpv rebuild. --- pkgs/applications/video/mpv/scripts/thumbfast.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix index ad0c2d574807..4899f556e8b2 100644 --- a/pkgs/applications/video/mpv/scripts/thumbfast.nix +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -11,13 +11,12 @@ buildLua { hash = "sha256-5u5WBvWOEydJrnr/vilEgW4+fxkxM6wNjb9Fyyxx/1c="; }; - postPatch = '' - substituteInPlace thumbfast.lua \ - --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getExe mpv-unwrapped}"' - ''; - scriptPath = "thumbfast.lua"; + passthru.extraWrapperArgs = [ + "--prefix" "PATH" ":" "${lib.getBin mpv-unwrapped}/bin" + ]; + meta = { description = "High-performance on-the-fly thumbnailer for mpv"; homepage = "https://github.com/po5/thumbfast"; From cd79e7c075ebf0191df542897f46c21587182762 Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 20:55:37 +0000 Subject: [PATCH 030/153] =?UTF-8?q?mpvScripts.visualizer:=20unstable-2021-?= =?UTF-8?q?07-10=20=E2=86=92=202023-08-13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/mpv/scripts/visualizer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index a248b63d503a..33d78be68041 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -5,13 +5,13 @@ }: stdenvNoCC.mkDerivation { pname = "visualizer"; - version = "unstable-2021-07-10"; + version = "unstable-2023-08-13"; src = fetchFromGitHub { owner = "mfcc64"; repo = "mpv-scripts"; - rev = "a0cd87eeb974a4602c5d8086b4051b5ab72f42e1"; - sha256 = "1xgd1nd117lpj3ppynhgaa5sbkfm7l8n6c9a2fy8p07is2dkndrq"; + rev = "7dbbfb283508714b73ead2a57b6939da1d139bd3"; + sha256 = "zzB4uBc1M2Gdr/JKY2uk8MY0hmQl1XeomkfTzuM45oE="; }; dontBuild = true; From 8bf840c35847ec94d57be8b5349f14b4e4aa92be Mon Sep 17 00:00:00 2001 From: nicoo Date: Sat, 9 Dec 2023 20:56:53 +0000 Subject: [PATCH 031/153] mpvScripts.visualizer: simplify with `buildLua` --- pkgs/applications/video/mpv/scripts/default.nix | 2 +- .../video/mpv/scripts/visualizer.nix | 16 ++-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 4083c52b3d90..e412781933f4 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -23,7 +23,7 @@ in lib.recurseIntoAttrs thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; uosc = callPackage ./uosc.nix { inherit buildLua; }; - visualizer = callPackage ./visualizer.nix { }; + visualizer = callPackage ./visualizer.nix { inherit buildLua; }; vr-reversal = callPackage ./vr-reversal.nix { }; webtorrent-mpv-hook = callPackage ./webtorrent-mpv-hook.nix { }; cutter = callPackage ./cutter.nix { }; diff --git a/pkgs/applications/video/mpv/scripts/visualizer.nix b/pkgs/applications/video/mpv/scripts/visualizer.nix index 33d78be68041..dedc2c62e907 100644 --- a/pkgs/applications/video/mpv/scripts/visualizer.nix +++ b/pkgs/applications/video/mpv/scripts/visualizer.nix @@ -1,9 +1,9 @@ { lib, - stdenvNoCC, + buildLua, fetchFromGitHub, }: -stdenvNoCC.mkDerivation { +buildLua { pname = "visualizer"; version = "unstable-2023-08-13"; @@ -14,21 +14,9 @@ stdenvNoCC.mkDerivation { sha256 = "zzB4uBc1M2Gdr/JKY2uk8MY0hmQl1XeomkfTzuM45oE="; }; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/mpv/scripts - cp visualizer.lua $out/share/mpv/scripts - runHook postInstall - ''; - - passthru.scriptName = "visualizer.lua"; - meta = with lib; { description = "various audio visualization"; homepage = "https://github.com/mfcc64/mpv-scripts"; - platforms = platforms.all; maintainers = with maintainers; [kmein]; }; } From 4a8c4be3983322557da6a3b9e588c3b3825b0fe9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Dec 2023 23:44:39 +0000 Subject: [PATCH 032/153] turbovnc: 3.0.3 -> 3.1 --- pkgs/tools/admin/turbovnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/turbovnc/default.nix b/pkgs/tools/admin/turbovnc/default.nix index 801fe1ba4a14..aaba4768a924 100644 --- a/pkgs/tools/admin/turbovnc/default.nix +++ b/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.0.3"; + version = "3.1"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc="; + hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk="; }; # TODO: From b18e4eaa2a541713ab8834304296d2547b657077 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 11:08:51 +0000 Subject: [PATCH 033/153] zef: 0.21.0 -> 0.21.1 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 66ee788ca430..ba7343a9f3ba 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-QVUnn9G28epoUEcK8mwm8S2wDQ/tv5B3Zds7bTUFwlw="; + sha256 = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; }; nativeBuildInputs = [ makeWrapper ]; From 68e29c7cca5969ec21581c6728ccc2725704c120 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Dec 2023 13:38:10 +0000 Subject: [PATCH 034/153] zrok: 0.4.15 -> 0.4.18 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 7b49b4a26b97..b6df1036122d 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -11,14 +11,14 @@ let }.${system} or throwSystem; sha256 = { - x86_64-linux = "sha256-6oYZY1Ry4U/nR99DNsr7ZqTd/AAot+yrOHY75UXEuWY="; - aarch64-linux = "sha256-/XAv/ptvUsWLF/iIOiqm/PoCLhVTL3Cnmd0YdqLBthk="; - armv7l-linux = "sha256-CbtzY2q7HnqCcolTFyTphWbHN/VdSt/rs8q3tjHHNqc="; + x86_64-linux = "sha256-vAX7vx13eHyPuDe4q5b8dQD90l5bbnncMGlXnegumxM="; + aarch64-linux = "sha256-6x/E0uAPFOsuoJ/ePLV483M07Rqj5pkcpETOVq9RXKU="; + armv7l-linux = "sha256-UlpqoKfjyGLNKvSrXqqsiiq/wTlfmBmPfynDoFT/nuQ="; }.${system} or throwSystem; in stdenv.mkDerivation rec { pname = "zrok"; - version = "0.4.15"; + version = "0.4.18"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; From 16a11b6be33fbd4dd474c00ec5790b03ea9efc9d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 15:59:50 +0100 Subject: [PATCH 035/153] swfmill: add darwin support --- pkgs/tools/video/swfmill/default.nix | 5 ++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index c93534bf1a20..8e6d0baf7e72 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -14,11 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; + # fatal error: 'libxml/xpath.h' file not found + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libxml2.dev}/include/libxml2"; + meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "swfmill"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..e7b3786a4e48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20202,7 +20202,7 @@ with pkgs; c3c = callPackage ../development/compilers/c3c { }; - swfmill = callPackage ../tools/video/swfmill { stdenv = gcc10StdenvCompat; }; + swfmill = callPackage ../tools/video/swfmill { }; swftools = callPackage ../tools/video/swftools { stdenv = gccStdenv; From a92211886b1987a8a70791f3f6f37e56857b104c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 29 Dec 2021 17:05:24 +0000 Subject: [PATCH 036/153] strelka: fix build on gcc-12 Without the change build fails as: src/c++/lib/calibration/IndelErrorModel.hh:100:33: error: 'numeric_limits' is not a member of 'std' 100 | double logErrorRate = -std::numeric_limits::infinity(); | ^~~~~~~~~~~~~~ --- .../applications/science/biology/strelka/default.nix | 12 +++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 9730601e4e7d..c66afa150c86 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, cmake, zlib, python2}: +{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, python2}: stdenv.mkDerivation rec { pname = "strelka"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1nykbmim1124xh22nrhrsn8xgjb3s2y7akrdapn9sl1gdych4ppf"; }; + patches = [ + # Pull pending fix for gcc-12: + # https://github.com/Illumina/strelka/pull/204 + (fetchpatch { + name = "limits.patch"; + url = "https://github.com/Illumina/strelka/commit/98272cd345c6e4c672e6a5b7721204fcac0502d6.patch"; + hash = "sha256-psBiuN32nvwZ+QX51JQjIdRhEE3k7PfwbkD10ckqvZk="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ zlib python2 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..46a5f0339005 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39131,7 +39131,7 @@ with pkgs; star = callPackage ../applications/science/biology/star { }; - strelka = callPackage ../applications/science/biology/strelka { stdenv = gcc10StdenvCompat; }; + strelka = callPackage ../applications/science/biology/strelka { }; inherit (callPackages ../applications/science/biology/sumatools {}) sumalibs From ac30f5f4d6e044daacd0ae6f891bd2bb63ff6167 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 10 Dec 2023 23:08:19 +0100 Subject: [PATCH 037/153] jigdo: 0.7.3 -> 0.8.2, refactor --- pkgs/applications/misc/jigdo/default.nix | 31 ------------- pkgs/applications/misc/jigdo/sizewidth.patch | 40 ----------------- pkgs/by-name/ji/jigdo/package.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 4 files changed, 46 insertions(+), 73 deletions(-) delete mode 100644 pkgs/applications/misc/jigdo/default.nix delete mode 100644 pkgs/applications/misc/jigdo/sizewidth.patch create mode 100644 pkgs/by-name/ji/jigdo/package.nix diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix deleted file mode 100644 index 9e07193cdb7f..000000000000 --- a/pkgs/applications/misc/jigdo/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, db, gtk2, bzip2 }: - -stdenv.mkDerivation rec { - pname = "jigdo"; - version = "0.7.3"; - - src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_${version}.orig.tar.gz"; - sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; - }; - - patches = [ - (fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz"; - sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y"; - }) - ./sizewidth.patch - ]; - - buildInputs = [ db gtk2 bzip2 ]; - - configureFlags = [ "--without-libdb" ]; - - meta = with lib; { - description = "Download utility that can fetch files from several sources simultaneously"; - homepage = "http://atterer.org/jigdo/"; - license = licenses.gpl2Only; - platforms = platforms.unix; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/applications/misc/jigdo/sizewidth.patch b/pkgs/applications/misc/jigdo/sizewidth.patch deleted file mode 100644 index 17b1749fcf77..000000000000 --- a/pkgs/applications/misc/jigdo/sizewidth.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git i/src/mkimage.cc w/src/mkimage.cc -index 02e65b1..b263796 100755 ---- i/src/mkimage.cc -+++ w/src/mkimage.cc -@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const { - //______________________________________________________________________ - - namespace { -- const int SIZE_WIDTH = 12; -+ const int MKIMAGE_SIZE_WIDTH = 12; - } - - ostream& JigdoDesc::ImageInfo::put(ostream& s) const { -- s << "image-info " << setw(SIZE_WIDTH) << size() << " " -+ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " " - << md5() << ' ' << blockLength() << '\n'; - return s; - } - ostream& JigdoDesc::UnmatchedData::put(ostream& s) const { -- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << '\n'; -+ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n'; - return s; - } - ostream& JigdoDesc::MatchedFile::put(ostream& s) const { -- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - ostream& JigdoDesc::WrittenFile::put(ostream& s) const { -- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' ' -- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; -+ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' ' -+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n'; - return s; - } - diff --git a/pkgs/by-name/ji/jigdo/package.nix b/pkgs/by-name/ji/jigdo/package.nix new file mode 100644 index 000000000000..4202bd4dd3dd --- /dev/null +++ b/pkgs/by-name/ji/jigdo/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchurl +, gettext +, bzip2 +, db +, zlib +}: + +stdenv.mkDerivation rec { + pname = "jigdo"; + version = "0.8.2"; + + src = fetchurl { + url = "https://www.einval.com/~steve/software/jigdo/download/jigdo-${version}.tar.xz"; + hash = "sha256-NvKG2T+mtr94hfSJnJl4lNIdo6YhdlkqwWLZxqhkT54="; + }; + + # unable to parse jigdo-file.sgml + postPatch = '' + sed \ + -e "s@.*cd doc.*@@g" \ + -e "s@.*/man1.*@\t\t:@g" \ + -i Makefile.in + ''; + + strictDeps = true; + + nativeBuildInputs = [ + gettext + ]; + + buildInputs = [ + bzip2 + db + zlib + ]; + + meta = with lib; { + description = "Download utility that can fetch files from several sources simultaneously"; + homepage = "https://www.einval.com/~steve/software/jigdo/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..046e96be7e18 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33008,8 +33008,6 @@ with pkgs; jgmenu = callPackage ../applications/misc/jgmenu { }; - jigdo = callPackage ../applications/misc/jigdo { stdenv = gcc10StdenvCompat; }; - jitsi = callPackage ../applications/networking/instant-messengers/jitsi { }; joe = callPackage ../applications/editors/joe { }; From 839a711508711b082dc0b1527ecc6faf7d49a7a7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:25:04 +0100 Subject: [PATCH 038/153] bencode: remove stdenv override --- pkgs/top-level/all-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..da2820005865 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20665,9 +20665,7 @@ with pkgs; belr = callPackage ../development/libraries/belr { }; - bencode = callPackage ../development/libraries/bencode { - stdenv = gcc10StdenvCompat; - }; + bencode = callPackage ../development/libraries/bencode { }; bencodetools = callPackage ../development/libraries/bencodetools { }; From f1f879734fea3b8d41747221d964486df3279b80 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 01:38:07 +0100 Subject: [PATCH 039/153] ericw-tools: fix build with gcc 11+ --- pkgs/applications/misc/ericw-tools/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ericw-tools/default.nix b/pkgs/applications/misc/ericw-tools/default.nix index dadd235319b3..9e833eafa770 100644 --- a/pkgs/applications/misc/ericw-tools/default.nix +++ b/pkgs/applications/misc/ericw-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , gtest, fmt , cmake, ninja, installShellFiles }: @@ -20,6 +20,13 @@ stdenv.mkDerivation rec { popd ''; + patches = [ + (fetchpatch { + url = "https://github.com/ericwa/ericw-tools/commit/c9570260fa895dde5a21272d76f9a3b05d59efdd.patch"; + hash = "sha256-dZr2LWuJBAIT//XHXYEz2vhaK2mxtxkSJ4IQla8OXKI="; + }) + ]; + nativeBuildInputs = [ cmake ninja installShellFiles ]; outputs = [ "out" "doc" "man" ]; @@ -44,5 +51,6 @@ stdenv.mkDerivation rec { description = "Map compile tools for Quake and Hexen 2"; license = licenses.gpl3Plus; maintainers = with maintainers; [ astro ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..fc655e4f5a2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8005,7 +8005,7 @@ with pkgs; eris-go = callPackage ../servers/eris-go { }; - ericw-tools = callPackage ../applications/misc/ericw-tools { stdenv = gcc10StdenvCompat; }; + ericw-tools = callPackage ../applications/misc/ericw-tools { }; cryfs = callPackage ../tools/filesystems/cryfs { }; From 7de3ca1228b8808481f86262f19dd44aefa1c907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 05:11:53 +0000 Subject: [PATCH 040/153] azure-static-sites-client: 1.0.024941 -> 1.0.025241 --- .../azure-static-sites-client/versions.json | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 55c30a12addf..76bdb693e4aa 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,58 +1,58 @@ [ { "version": "latest", - "buildId": "1.0.024941", - "publishDate": "2023-10-31T04:54:50.5527205Z", + "buildId": "1.0.025241", + "publishDate": "2023-11-30T02:51:40.8356813Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", - "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", + "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", - "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", + "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", - "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", + "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" } } }, { "version": "stable", - "buildId": "1.0.024941", - "publishDate": "2023-10-31T04:54:50.5527205Z", + "buildId": "1.0.025241", + "publishDate": "2023-11-30T02:51:40.8356813Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/linux/StaticSitesClient", - "sha": "bea23499732d615698baf4c9dcafe717fdd4ba8344f2d96740233b0380df79b6" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/linux/StaticSitesClient", + "sha": "e4ccb44c516e03e6dcc2a26a35ffd4c84a61dfea581990dd5c0edb7c12662db0" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/windows/StaticSitesClient.exe", - "sha": "a93aa5ec2a17280f3c9c8252948f8c68050c8852770322758ffa3187b6bce1dd" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/windows/StaticSitesClient.exe", + "sha": "4146ac01a488910d6ea066e1c46505048b0c9af2e74ef273c4236b387796712d" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024941/macOS/StaticSitesClient", - "sha": "57ea66c930aafbf4dea82216e51128b3315ec2db3ab385d41e8d912a3adab2c0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025241/macOS/StaticSitesClient", + "sha": "05b213d7861454368d2c9801b0ccc75cfd13cb48f8e121fffaa2ab7e9b5671cd" } } }, { "version": "backup", - "buildId": "1.0.024871", - "publishDate": "2023-10-24T04:09:23.7109231Z", + "buildId": "1.0.025142", + "publishDate": "2023-11-20T09:32:48.489649Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/linux/StaticSitesClient", - "sha": "13d1c02e43dec373be04152f7f8e71974f080440cb9480c3ccb4f83c8c6f036a" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/linux/StaticSitesClient", + "sha": "f36cce34f04b045e3ea5de5c201ce6663925d9680e3b5986b417534898b995b2" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/windows/StaticSitesClient.exe", - "sha": "868f221ea77b13cea8c6c41edbecea53bf5171d42dc9376f34615e544a3874f0" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/windows/StaticSitesClient.exe", + "sha": "1e8932e2c4189d40657db888f82dfb030c2d41951421dd9a68712960e7c7fa7b" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.024871/macOS/StaticSitesClient", - "sha": "63c9027a7b5e597ae9e0ad8311b31a587bd977ed758555784d08cc3ff35e80a4" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.025142/macOS/StaticSitesClient", + "sha": "891faef16ae06fc609f787ffce7d6a1816e24fddfcaef9bc10e3b50208fe29aa" } } } From 3ce2a25e504a72e727e6bdf845655344e55ee4a6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 13:37:17 +0100 Subject: [PATCH 041/153] strelka: add aarch64-linux support --- .../science/biology/strelka/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index c66afa150c86..ad6c0d9e5a4c 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, python2}: +{lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, zlib, python2}: stdenv.mkDerivation rec { pname = "strelka"; @@ -21,8 +21,18 @@ stdenv.mkDerivation rec { }) ]; + postPatch = '' + substituteInPlace src/cmake/boost.cmake \ + --replace "1.58.0" "${boost.version}" \ + --replace "Boost_USE_STATIC_LIBS ON" "Boost_USE_STATIC_LIBS OFF" + ''; + nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib python2 ]; + buildInputs = [ boost zlib python2 ]; + + cmakeFlags = [ + "-DCMAKE_CXX_STANDARD=14" + ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" @@ -47,7 +57,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; homepage = "https://github.com/Illumina/strelka"; maintainers = with maintainers; [ jbedo ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } From 9e7e41c43d6ba72feadeca221af48a968d016068 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 11 Dec 2023 13:58:03 +0100 Subject: [PATCH 042/153] systemd: fix path to stubs in ukify --- pkgs/os-specific/linux/systemd/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 01054fa7fc6b..f418d58259c9 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -243,7 +243,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/ukify/ukify.py \ --replace \ "'readelf'" \ - "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" + "'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'" \ + --replace \ + "/usr/lib/systemd/boot/efi" \ + "$out/lib/systemd/boot/efi" '' + ( let # The following patches references to dynamic libraries to ensure that From a3c60d2ddc9f70dca3fa5c5926aefc9a74bd2519 Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 1 Dec 2023 15:42:46 -0300 Subject: [PATCH 043/153] nixos/nginx: make redirect status code configurable Add an option to configure which code globalRedirect and forceSSL use. It previously was always 301 with no easy way to override. --- .../manual/release-notes/rl-2405.section.md | 4 +++ .../services/web-servers/nginx/default.nix | 4 +-- .../web-servers/nginx/vhost-options.nix | 25 ++++++++++++++----- nixos/tests/all-tests.nix | 1 + nixos/tests/nginx-redirectcode.nix | 25 +++++++++++++++++++ 5 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 nixos/tests/nginx-redirectcode.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 15696e802c12..45e298e682c7 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -47,6 +47,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m existing process, but will need to start that process from gdb (so it is a child). Or you can set `boot.kernel.sysctl."kernel.yama.ptrace_scope"` to 0. +- [Nginx virtual hosts](#opt-services.nginx.virtualHosts) using `forceSSL` or + `globalRedirect` can now have redirect codes other than 301 through + `redirectCode`. + - Gitea 1.21 upgrade has several breaking changes, including: - Custom themes and other assets that were previously stored in `custom/public/*` now belong in `custom/public/assets/*` - New instances of Gitea using MySQL now ignore the `[database].CHARSET` config option and always use the `utf8mb4` charset, existing instances should migrate via the `gitea doctor convert` CLI command. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index cf70dc325945..848d12b17f87 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -377,7 +377,7 @@ let server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} location / { - return 301 https://$host$request_uri; + return ${toString vhost.redirectCode} https://$host$request_uri; } } ''} @@ -396,7 +396,7 @@ let ${optionalString (vhost.root != null) "root ${vhost.root};"} ${optionalString (vhost.globalRedirect != null) '' location / { - return 301 http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; + return ${toString vhost.redirectCode} http${optionalString hasSSL "s"}://${vhost.globalRedirect}$request_uri; } ''} ${optionalString hasSSL '' diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix index 9db4c8e23025..64a95afab9f4 100644 --- a/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -162,10 +162,11 @@ with lib; type = types.bool; default = false; description = lib.mdDoc '' - Whether to add a separate nginx server block that permanently redirects (301) - all plain HTTP traffic to HTTPS. This will set defaults for - `listen` to listen on all interfaces on the respective default - ports (80, 443), where the non-SSL listens are used for the redirect vhosts. + Whether to add a separate nginx server block that redirects (defaults + to 301, configurable with `redirectCode`) all plain HTTP traffic to + HTTPS. This will set defaults for `listen` to listen on all interfaces + on the respective default ports (80, 443), where the non-SSL listens + are used for the redirect vhosts. ''; }; @@ -307,8 +308,20 @@ with lib; default = null; example = "newserver.example.org"; description = lib.mdDoc '' - If set, all requests for this host are redirected permanently to - the given hostname. + If set, all requests for this host are redirected (defaults to 301, + configurable with `redirectCode`) to the given hostname. + ''; + }; + + redirectCode = mkOption { + type = types.ints.between 300 399; + default = 301; + example = 308; + description = lib.mdDoc '' + HTTP status used by `globalRedirect` and `forceSSL`. Possible usecases + include temporary (302, 307) redirects, keeping the request method and + body (307, 308), or explicitly resetting the method to GET (303). + See . ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e0572e3bed9c..9f3bf284da02 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -583,6 +583,7 @@ in { nginx-njs = handleTest ./nginx-njs.nix {}; nginx-proxyprotocol = handleTest ./nginx-proxyprotocol {}; nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; + nginx-redirectcode = handleTest ./nginx-redirectcode.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {}; nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; diff --git a/nixos/tests/nginx-redirectcode.nix b/nixos/tests/nginx-redirectcode.nix new file mode 100644 index 000000000000..f60434a21a85 --- /dev/null +++ b/nixos/tests/nginx-redirectcode.nix @@ -0,0 +1,25 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "nginx-redirectcode"; + meta.maintainers = with lib.maintainers; [ misterio77 ]; + + nodes = { + webserver = { pkgs, lib, ... }: { + services.nginx = { + enable = true; + virtualHosts.localhost = { + globalRedirect = "example.com/foo"; + # With 308 (and 307), the method and body are to be kept when following it + redirectCode = 308; + }; + }; + }; + }; + + testScript = '' + webserver.wait_for_unit("nginx") + webserver.wait_for_open_port(80) + + # Check the status code + webserver.succeed("curl -si http://localhost | grep '^HTTP/[0-9.]\+ 308 Permanent Redirect'") + ''; +}) From cd1eb081adb521260660e5193ab523c2904a4982 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 10 Dec 2023 12:13:43 -0500 Subject: [PATCH 044/153] hydra_unstable: add patch for fixing accessing git inputs on flakes --- pkgs/development/tools/misc/hydra/unstable.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 544a0221737e..8ee7c7f6fb92 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -43,6 +43,7 @@ , cacert , glibcLocales , fetchFromGitHub +, fetchpatch2 , nixosTests }: @@ -132,6 +133,17 @@ stdenv.mkDerivation rec { hash = "sha256-FjyMb5ZbPa2GLrRuFMUP/foKb0KvXFKThvgc9faFIw8="; }; + patches = [ + # hydra-eval-jobs: don't use restrict-eval for Flakes + # https://github.com/NixOS/hydra/pull/1257 + # should be removed when https://github.com/NixOS/nix/pull/9547 + # lands in the nix version used by hydra + (fetchpatch2 { + url = "https://github.com/NixOS/hydra/commit/9370b0ef977bff7e84ac07a81a0e31e75989276b.patch"; + hash = "sha256-BRenC0lpWPgzfx42MPJBQ9VBamh5hZXuuVe6TXYKkdE="; + }) + ]; + buildInputs = [ unzip libpqxx From fdb90f8daf5aa2638f54edf75c9425f51c602f28 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:36:30 +0100 Subject: [PATCH 045/153] discord: 0.0.35 -> 0.0.37 --- .../instant-messengers/discord/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 6a5cdfd152de..0ab2012edee5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,22 +1,23 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let - versions = if stdenv.isLinux then { - stable = "0.0.35"; - ptb = "0.0.56"; - canary = "0.0.184"; - development = "0.0.0"; - } else { - stable = "0.0.284"; - ptb = "0.0.87"; - canary = "0.0.340"; - development = "0.0.2"; - }; + versions = + if stdenv.isLinux then { + stable = "0.0.37"; + ptb = "0.0.56"; + canary = "0.0.184"; + development = "0.0.0"; + } else { + stable = "0.0.284"; + ptb = "0.0.87"; + canary = "0.0.340"; + development = "0.0.2"; + }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-VcSRV9LDiUXduRt20kVeAnwinl6FmACQgn//W6eFyys="; + hash = "sha256-uyflZ1Zks7M1Re6DxuNUAkIuPY4wFSydf2AGMtIube8="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 3dd2cdad9bbec20121fd4ea059530897a355ed5d Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:37:18 +0100 Subject: [PATCH 046/153] discord-ptb: 0.0.56 -> 0.0.59 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 0ab2012edee5..e72451db0577 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -3,7 +3,7 @@ let versions = if stdenv.isLinux then { stable = "0.0.37"; - ptb = "0.0.56"; + ptb = "0.0.59"; canary = "0.0.184"; development = "0.0.0"; } else { @@ -21,7 +21,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-RDXApmhlu2aQTjWVXMyRp0CL29btsQufIPuxjjtJGIU="; + hash = "sha256-WhDEyRMjuy2e1N51tUj3v97Y0qWabCFPThaehadXFWs="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; From 91976d3a92a6806a54b7e9779b52d40d76c83619 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:38:00 +0100 Subject: [PATCH 047/153] discord-canary: 0.0.184 -> 0.0.213 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index e72451db0577..d2cb1c042219 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -4,7 +4,7 @@ let if stdenv.isLinux then { stable = "0.0.37"; ptb = "0.0.59"; - canary = "0.0.184"; + canary = "0.0.213"; development = "0.0.0"; } else { stable = "0.0.284"; @@ -25,7 +25,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-Pu0kei/ls9yrDEpRQcgDAaEkRbYkFmp/jTwOkljoy18="; + hash = "sha256-DGRq58Xj5p/7BunY/vFds9LVmxYOl9LcF8ESHrCLly4="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; From ee0d586f8c8b4e67a4135ffd49e8e29c13286f6d Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:39:08 +0100 Subject: [PATCH 048/153] discord-development: 0.0.0 -> 0.0.1 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d2cb1c042219..1e192d8d5ace 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,7 +5,7 @@ let stable = "0.0.37"; ptb = "0.0.59"; canary = "0.0.213"; - development = "0.0.0"; + development = "0.0.1"; } else { stable = "0.0.284"; ptb = "0.0.87"; @@ -29,7 +29,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-/+9NyreRkXu2++uhwCh3/C1Cos39hfzB0Yjf0Otg9pk="; + hash = "sha256-unzPakomF2hmiikrNfnOueBdcuZCz2z3oCA7Djn6OmY="; }; }; x86_64-darwin = { From b6649b51c1efce823fae64c16bb190b88e1db9df Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:39:44 +0100 Subject: [PATCH 049/153] discord: 0.0.284 -> 0.0.287 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1e192d8d5ace..2c4320bcce97 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,7 +7,7 @@ let canary = "0.0.213"; development = "0.0.1"; } else { - stable = "0.0.284"; + stable = "0.0.287"; ptb = "0.0.87"; canary = "0.0.340"; development = "0.0.2"; @@ -35,7 +35,7 @@ let x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-TTzhc6P0hFG9BFMviNx8CCg1cVEKDiB3gtb8oR/slNA="; + hash = "sha256-DTkWrUgSYP98IVFTWcm4muRR91Kfvs5pBxc1tvPmj/s="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; From 27b7e40f688771a5483ae424e8662b2a2d3d8d79 Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:40:15 +0100 Subject: [PATCH 050/153] discord-ptb: 0.0.87 -> 0.0.90 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2c4320bcce97..c0fa8695c339 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -8,7 +8,7 @@ let development = "0.0.1"; } else { stable = "0.0.287"; - ptb = "0.0.87"; + ptb = "0.0.90"; canary = "0.0.340"; development = "0.0.2"; }; @@ -39,7 +39,7 @@ let }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-cl6+kTth/7j+HJHPU4Oy1N5EnmMbpdvltKzrU1by+Ik="; + hash = "sha256-wOTgcHRUu/CjdnvQVNL+rkazhVbZjwI+UbfmsF6aveg="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; From bc86fb0a7b24c45bdbc760214dec39ad8a146fad Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:40:48 +0100 Subject: [PATCH 051/153] discord-canary: 0.0.340 -> 0.0.365 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index c0fa8695c339..98f36040cf6e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -9,7 +9,7 @@ let } else { stable = "0.0.287"; ptb = "0.0.90"; - canary = "0.0.340"; + canary = "0.0.365"; development = "0.0.2"; }; version = versions.${branch}; @@ -43,7 +43,7 @@ let }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-LfixXyCoTnifw2GVAnCDnBla757JyGzbvUJwY4UhgGI="; + hash = "sha256-a4MyO2Wst+ZYNSpUaF0TXJKtDQcPRLehapwRzp10R2k="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; From 3c6a5616041c0fef745326eb20a41e2d922d3f2d Mon Sep 17 00:00:00 2001 From: Yuriy Taraday Date: Mon, 11 Dec 2023 15:41:28 +0100 Subject: [PATCH 052/153] discord-development: 0.0.2 -> 0.0.10 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 98f36040cf6e..aa8db54725c9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -10,7 +10,7 @@ let stable = "0.0.287"; ptb = "0.0.90"; canary = "0.0.365"; - development = "0.0.2"; + development = "0.0.10"; }; version = versions.${branch}; srcs = rec { @@ -47,7 +47,7 @@ let }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-iMw61dXtThXvz2GnZiM4+tURMRfXhrN/ze1RTBL6zy8="; + hash = "sha256-FoYRW5SaR/53yKs/T2XKVKQevA3MxMWAJFjixtwsEF4="; }; }; aarch64-darwin = x86_64-darwin; From 9df6d127252ee6a4a752ceb646541e4b7846924e Mon Sep 17 00:00:00 2001 From: Sebastian Gabriel Trzpiot Date: Mon, 11 Dec 2023 16:11:24 +0100 Subject: [PATCH 053/153] logseq: 0.10.0 -> 0.10.1 https://github.com/logseq/logseq/releases/tag/0.10.1 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index f4e07656752c..9c9e83655419 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-igZM+kNe1GDPYckXU6fOjyovHe9gwyBWr7Mc3BxAzOA="; + hash = "sha256-jDIfOHGki4InGuLvsnxdd2/FMPbT3VyuHtPxA4r3s5c="; name = "${pname}-${version}.AppImage"; }; From 9f20b6b012756b40c5fd07bc1153998b3777024e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Dec 2023 16:35:00 +0100 Subject: [PATCH 054/153] dependency-track-exporter: init at 0.1.2 Helper to export Prometheus metrics for Dependency-Track https://github.com/jetstack/dependency-track-exporter --- .../de/dependency-track-exporter/package.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/de/dependency-track-exporter/package.nix diff --git a/pkgs/by-name/de/dependency-track-exporter/package.nix b/pkgs/by-name/de/dependency-track-exporter/package.nix new file mode 100644 index 000000000000..8a66db363c2c --- /dev/null +++ b/pkgs/by-name/de/dependency-track-exporter/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dependency-track-exporter"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "jetstack"; + repo = "dependency-track-exporter"; + rev = "refs/tags/v${version}"; + hash = "sha256-yvScGxgkyZzEdfeJCXk/tSk3cLW+jyw00XbJVrpU6MY="; + }; + + vendorHash = "sha256-bEJFTsGQMDfZOt67ouv3PkKy+De4mL9Yk7iuslo1qYU="; + + ldflags = [ + "-X=github.com/prometheus/common/version.Version=${version}" + "-X=github.com/prometheus/common/version.Revision=${src.rev}" + "-X=github.com/prometheus/common/version.Branch=${src.rev}" + "-X=github.com/prometheus/common/version.BuildDate=1970-01-01T00:00:00Z" + ]; + + meta = with lib; { + description = "Helper to export Prometheus metrics for Dependency-Track"; + homepage = "https://github.com/jetstack/dependency-track-exporter"; + changelog = "https://github.com/jetstack/dependency-track-exporter/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + mainProgram = "dependency-track-exporter"; + }; +} From 9ed63709bc3cadecbd4484e24f0f7ed47188b464 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 10 Dec 2023 13:38:18 +0800 Subject: [PATCH 055/153] =?UTF-8?q?flatpak:=201.14.4=20=E2=86=92=201.14.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/flatpak/flatpak/compare/1.14.4...1.14.5 This contains build fix for AppStream 1.0. --- nixos/modules/services/desktops/flatpak.nix | 1 + nixos/tests/installed-tests/flatpak.nix | 1 + pkgs/development/libraries/flatpak/default.nix | 4 ++-- .../libraries/flatpak/fix-test-paths.patch | 12 +++++++++--- .../libraries/flatpak/unset-env-vars.patch | 8 ++++---- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index d99faf381e01..4c26e6874023 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -35,6 +35,7 @@ in { services.dbus.packages = [ pkgs.flatpak ]; systemd.packages = [ pkgs.flatpak ]; + systemd.tmpfiles.packages = [ pkgs.flatpak ]; environment.profiles = [ "$HOME/.local/share/flatpak/exports" diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix index 9524d890c402..fa191202f52d 100644 --- a/nixos/tests/installed-tests/flatpak.nix +++ b/nixos/tests/installed-tests/flatpak.nix @@ -7,6 +7,7 @@ makeInstalledTest { testConfig = { xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; + xdg.portal.config.common.default = "gtk"; services.flatpak.enable = true; environment.systemPackages = with pkgs; [ gnupg ostree python3 ]; virtualisation.memorySize = 2047; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 0c44b99db8d9..005890a3d4a6 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.14.4"; + version = "1.14.5"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "devdoc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-ijTb0LZ8Q051mLmOxpCVPQRvDbJuSArq+0bXKuxxZ5k="; # Taken from https://github.com/flatpak/flatpak/releases/ + sha256 = "sha256-W3DGTOesE04eoIARJW5COuXFTydyl0QVg/d9AT8n/6w="; # Taken from https://github.com/flatpak/flatpak/releases/ }; patches = [ diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index da1475009009..ebbcbde5e951 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -63,7 +63,7 @@ index afa11a6b..5b12055f 100755 flatpak build-finish ${DIR} >&2 mkdir -p repos diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh -index 4ba950df..fd50fab3 100755 +index 6345ff58..fd50fab3 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh @@ -28,9 +28,10 @@ EOF @@ -78,7 +78,7 @@ index 4ba950df..fd50fab3 100755 mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -40,40 +41,17 @@ if test -f /sbin/ldconfig.real; then +@@ -40,46 +41,17 @@ if test -f /sbin/ldconfig.real; then else cp "$(type -P ldconfig)" "${DIR}/usr/bin" fi @@ -89,6 +89,12 @@ index 4ba950df..fd50fab3 100755 - local f=$1 - shift - +- # Check if the program is installed +- if ! command -v "${f}" &> /dev/null; then +- echo "${f} not found" +- exit 1 +- fi +- - if grep -qFe "${f}" $BINS; then - # Already handled - return 0 @@ -129,7 +135,7 @@ index 4ba950df..fd50fab3 100755 done ln -s bash ${DIR}/usr/bin/sh -@@ -84,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" +@@ -90,11 +62,13 @@ echo "Hello world, from a runtime$EXTRA" EOF chmod a+x ${DIR}/usr/bin/runtime_hello.sh diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index fec0573ed950..2a88d24f4916 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,11 +1,11 @@ diff --git a/common/flatpak-run.c b/common/flatpak-run.c -index 8fa8c0e0..e1cdeba0 100644 +index 6f54a9d0..102d9b90 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1900,6 +1900,7 @@ static const ExportData default_exports[] = { - {"XKB_CONFIG_ROOT", NULL}, - {"GIO_EXTRA_MODULES", NULL}, +@@ -1902,6 +1902,7 @@ static const ExportData default_exports[] = { {"GDK_BACKEND", NULL}, + {"VK_DRIVER_FILES", NULL}, + {"VK_ICD_FILENAMES", NULL}, + {"GDK_PIXBUF_MODULE_FILE", NULL}, }; From 711f215260beb4461d7e9c7fa399a930eb71d372 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 16:43:06 +0000 Subject: [PATCH 056/153] circt: 1.59.0 -> 1.61.0 --- pkgs/development/compilers/circt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index 4c4f69bc74ff..80d6df2149e5 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.59.0"; + version = "1.61.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-HsfvLxXyYvzUL+FO/i8iRbyQV8OFF3Cx8/g8/9aJE2M="; + sha256 = "sha256-3zuaruaveUeJ7uKP5fMiDFPOGKcs6aTNuGOuhxV6nss="; fetchSubmodules = true; }; From 4c16b1d265a65cc25f434f08274f75aca0b49f04 Mon Sep 17 00:00:00 2001 From: suntropez <99491241+suntropez@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:49:28 -0300 Subject: [PATCH 057/153] platformsh: 4.10.0 -> 4.11.4 --- pkgs/by-name/pl/platformsh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pl/platformsh/package.nix b/pkgs/by-name/pl/platformsh/package.nix index 458cad998ff7..5d9e6dc2d2f4 100644 --- a/pkgs/by-name/pl/platformsh/package.nix +++ b/pkgs/by-name/pl/platformsh/package.nix @@ -2,16 +2,16 @@ php.buildComposerProject (finalAttrs: { pname = "platformsh"; - version = "4.10.0"; + version = "4.11.4"; src = fetchFromGitHub { owner = "platformsh"; repo = "legacy-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-aEQxlotwMScEIfHrVDdXBgFxMqAIypkEl9TLi1Bvhnw="; + hash = "sha256-4Fo4vmTEo0rSJNtoGz/mRv5dRCMq5vJmnwAxsvfs9qo="; }; - vendorHash = "sha256-e89xxgTI6FajDfj8xr8VYlbxJD6lUZWz5+2UFQTClsY="; + vendorHash = "sha256-MuZKa4lKvfls85cYjOTHHd6lKVVS0QJD6Pdn7csSzUo="; prePatch = '' substituteInPlace config-defaults.yaml \ From 1b789cb5bc1727b87d4804e817a2f3df95ddc67b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 18:50:15 +0100 Subject: [PATCH 058/153] diopser: fix build with gcc 11+ --- pkgs/applications/audio/diopser/default.nix | 10 +++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/diopser/default.nix b/pkgs/applications/audio/diopser/default.nix index 339eae1a7ca9..67b95aef923f 100644 --- a/pkgs/applications/audio/diopser/default.nix +++ b/pkgs/applications/audio/diopser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config , libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor }: @@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx"; }; + patches = [ + (fetchpatch { + name = "fix-gcc-11-build.patch"; + url = "https://github.com/robbert-vdh/diopser/commit/a7284439bd4e23455132e7806a214f9db12efae9.patch"; + hash = "sha256-r3yxhnhPUQ47srhfAKeurpe2xyEBdSvqIbgqs9/6gD4="; + }) + ]; + postUnpack = '' ( cd "$sourceRoot" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e59de08224d3..03e8c9dfe4b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3761,7 +3761,7 @@ with pkgs; dfmt = callPackage ../tools/text/dfmt { }; - diopser = callPackage ../applications/audio/diopser { stdenv = gcc10StdenvCompat; }; + diopser = callPackage ../applications/audio/diopser { }; diskonaut = callPackage ../tools/misc/diskonaut { }; From f19386d03dba0993c5f175d2982abef8f32fd5ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 11 Dec 2023 19:25:21 +0100 Subject: [PATCH 059/153] qlog: 0.29.2 -> 0.30.0 --- pkgs/applications/radio/qlog/default.nix | 8 ++---- pkgs/applications/radio/qlog/mac.patch | 32 ------------------------ 2 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 pkgs/applications/radio/qlog/mac.patch diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix index 5a790a12cdae..9c43d40681f0 100644 --- a/pkgs/applications/radio/qlog/default.nix +++ b/pkgs/applications/radio/qlog/default.nix @@ -16,22 +16,18 @@ stdenv.mkDerivation rec { pname = "qlog"; - version = "0.29.2"; + version = "0.30.0"; src = fetchFromGitHub { owner = "foldynl"; repo = "QLog"; rev = "v${version}"; - hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + hash = "sha256-WgLUIWggUKHPjVa6brkJzeRMZli/qhfu4jatf+JYIRU="; fetchSubmodules = true; }; env.NIX_LDFLAGS = "-lhamlib"; - patches = [ - ./mac.patch - ]; - buildInputs = [ qtbase qtcharts diff --git a/pkgs/applications/radio/qlog/mac.patch b/pkgs/applications/radio/qlog/mac.patch deleted file mode 100644 index 661d508ab4e5..000000000000 --- a/pkgs/applications/radio/qlog/mac.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 2b0ed30806b34315962da382cb41edf5f19b231e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Sat, 25 Nov 2023 14:22:24 +0100 -Subject: [PATCH] Add installation to PREFIX on mac when set - -This allows the app to be shipped in a non-bundeled version - -We need this to ship the app on macOS with nix ---- - QLog.pro | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/QLog.pro b/QLog.pro -index db6686f..576bfe1 100644 ---- a/QLog.pro -+++ b/QLog.pro -@@ -386,6 +386,12 @@ macx: { - equals(QT_MAJOR_VERSION, 6): LIBS += -lqt6keychain - equals(QT_MAJOR_VERSION, 5): LIBS += -lqt5keychain - DISTFILES += -+ -+ # This allows the app to be shipped in a non-bundeled version -+ !isEmpty(PREFIX) { -+ target.path = $$PREFIX -+ INSTALLS += target -+ } - } - - win32: { --- -2.42.0 - From 9fd37a46fe69928250a1e6b0bd9791d1892db86c Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Mon, 11 Dec 2023 19:28:11 +0100 Subject: [PATCH 060/153] glamoroustoolkit: 1.0.6 -> 1.0.7 --- pkgs/development/tools/glamoroustoolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 73c2dab8f342..99b9f528df46 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.6"; + version = "1.0.7"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-263Bl5zd2k5DAPB/Ar8QMpthMiAv7BUSZ5+G03ZL5m0="; + hash = "sha256-WcAOGPWbY3sCcwmSHTjZvO3ASYYPv1T0iEA5C/VXL9I="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 912e7ab90d83292d939452d2aa3d5e56def37c4f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:31:46 +0100 Subject: [PATCH 061/153] ode: refactor, add darwin support --- pkgs/development/libraries/ode/default.nix | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index d35976932663..6ae60b7b2d3a 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -1,18 +1,33 @@ -{ lib, stdenv, fetchurl }: +{ lib +, stdenv +, fetchurl +, darwin +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ode"; version = "0.16.4"; src = fetchurl { - url = "https://bitbucket.org/odedevs/${pname}/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; + url = "https://bitbucket.org/odedevs/ode/downloads/ode-${finalAttrs.version}.tar.gz"; + hash = "sha256-cQN7goHGyGsKVXKfkNXbaXq+TL7B2BGBV+ANSOwlNGc="; }; + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.GLUT + ]; + + env.CXXFLAGS = lib.optionalString stdenv.cc.isClang (toString [ + "-std=c++14" + "-Wno-error=c++11-narrowing" + ]); + meta = with lib; { description = "Open Dynamics Engine"; homepage = "https://www.ode.org"; - platforms = platforms.linux; - license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; + license = with licenses; [ bsd3 lgpl21Only lgpl3Only zlib ]; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; -} +}) From 6666381ea54cef914bb5b7735b7f7df92dc11abe Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 11 Dec 2023 19:35:21 +0100 Subject: [PATCH 062/153] fluxus: cleanup, unbreak --- pkgs/applications/graphics/fluxus/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 1ac1666f8f40..5491305fad2c 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -1,17 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , alsa-lib -, bzip2 , fftw , freeglut , freetype , glew , libjack2 -, libGL -, libGLU , libjpeg , liblo -, libpng , libsndfile , libtiff , ode @@ -19,12 +16,11 @@ , openssl , racket_7_9 , scons -, zlib }: let racket = racket_7_9; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "fluxus"; version = "0.19"; src = fetchFromGitLab { @@ -53,6 +49,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ scons ]; patches = [ ./fix-build.patch ]; + postPatch = '' + substituteInPlace src/Unicode.cpp \ + --replace "(byte)" "(unsigned char)" + ''; sconsFlags = [ "RacketPrefix=${racket}" "RacketInclude=${racket}/include/racket" @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; homepage = "http://www.pawfal.org/fluxus/"; maintainers = [ maintainers.brainrape ]; - broken = true; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c80308d1b9a..6d10c6c6877c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31599,7 +31599,7 @@ with pkgs; flrig = callPackage ../applications/radio/flrig { }; - fluxus = callPackage ../applications/graphics/fluxus { stdenv = gcc10StdenvCompat; }; + fluxus = callPackage ../applications/graphics/fluxus { }; flwrap = callPackage ../applications/radio/flwrap { }; From 6221bbdb87cd24e4a1e783295acb27b943aeed2a Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 11 Dec 2023 14:02:42 -0500 Subject: [PATCH 063/153] footswitch: migrate to pkgs/by-name --- .../default.nix => by-name/fo/footswitch/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/inputmethods/footswitch/default.nix => by-name/fo/footswitch/package.nix} (100%) diff --git a/pkgs/tools/inputmethods/footswitch/default.nix b/pkgs/by-name/fo/footswitch/package.nix similarity index 100% rename from pkgs/tools/inputmethods/footswitch/default.nix rename to pkgs/by-name/fo/footswitch/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c80308d1b9a..93643e380885 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8331,8 +8331,6 @@ with pkgs; fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { }; - footswitch = callPackage ../tools/inputmethods/footswitch { }; - foremost = callPackage ../tools/system/foremost { }; forktty = callPackage ../os-specific/linux/forktty { }; From f028bf2a11f5d28f1bc3ae9dc5042c85979ec76a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 19:03:00 +0000 Subject: [PATCH 064/153] discordo: unstable-2023-11-14 -> unstable-2023-12-11 --- pkgs/applications/networking/discordo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 8b46e31b7b5c..148ca77a91ae 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "discordo"; - version = "unstable-2023-11-14"; + version = "unstable-2023-12-11"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "002e382c0de1d87e2ce7fd579346da4f339880ca"; - hash = "sha256-eOlPc2WDjc73UlFH9d6Kw4/nEbjhBv4xLopxdTnFTYk="; + rev = "9c9ea0dc2fdd4ca18c68b08585bcc5b276388d62"; + hash = "sha256-6gGbro4OsPh+HK9GR01uOUN80lgwMd7oLq9ASWtpNoY="; }; - vendorHash = "sha256-1evMzQECqZvKJzNUk9GjrQej9vmnHs9Fm4kXJ0i5gMw="; + vendorHash = "sha256-8qr1erKGyJvR4LDKHkZf7nR0tQOcvUHQyJt7OlqNS44="; CGO_ENABLED = 0; From b42e01adf8dc2ba97b9c8bc3ea282fb72b874911 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 20:14:43 +0100 Subject: [PATCH 065/153] i3-balance-workspace: add mainProgram --- pkgs/applications/window-managers/i3/balance-workspace.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index f3c2e13fbdcb..bb0ea94e77c3 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -19,5 +19,6 @@ buildPythonPackage rec { homepage = "https://pypi.org/project/i3-balance-workspace/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pacien ]; + mainProgram = "i3_balance_workspace"; }; } From 9ba37edd774e30b77bc04e03ac1fb65f2a00af81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 19:30:19 +0000 Subject: [PATCH 066/153] dotter: 0.13.0 -> 0.13.1 --- pkgs/tools/misc/dotter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index 2abe844531b5..bcabb2ef8aac 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-mAvTy/11a9RGSQpElhpKMzsMC7vA7cbeHsNRy9MnIjw="; + hash = "sha256-Xmdg5ITKWhL5AxTS7z4f9ecigQpBqna+kZclA+mDJhA="; }; - cargoHash = "sha256-XsDp/ssoNVdTHDTPm2ucgBeYmFgbeBIxQ/NsGjCl5Qg="; + cargoHash = "sha256-W8khm9E5f/PROVJDAUr57nAiTEXV4a0fepzV00HoT8c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; From 4727ba55bfa43575b731c47be616f3994c5cf8cc Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 20:35:40 +0100 Subject: [PATCH 067/153] rss2email: add mainProgram --- pkgs/applications/networking/feedreaders/rss2email/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 2653af6f51ae..b9e903c236a5 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -43,6 +43,7 @@ buildPythonApplication rec { homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ ekleog ]; + mainProgram = "r2e"; }; passthru.tests = { smoke-test = nixosTests.rss2email; From afe86aac27ed826b3dfb846a926c509c2dff8c32 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Mon, 11 Dec 2023 15:03:56 -0500 Subject: [PATCH 068/153] footswitch: unstable-2022-04-12 -> unstable-2023-10-10 --- pkgs/by-name/fo/footswitch/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fo/footswitch/package.nix b/pkgs/by-name/fo/footswitch/package.nix index a01069c9284f..0856f758c8b8 100644 --- a/pkgs/by-name/fo/footswitch/package.nix +++ b/pkgs/by-name/fo/footswitch/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "footswitch"; - version = "unstable-2022-04-12"; + version = "unstable-2023-10-10"; src = fetchFromGitHub { owner = "rgerganov"; repo = "footswitch"; - rev = "1cf63643e18e688e4ebe96451db24edf52338cc0"; - sha256 = "0gfvi2wgrljndyz889cjjh2q13994fnaf11n7hpdd82c4wgg06kj"; + rev = "b7493170ecc956ac87df2c36183253c945be2dcf"; + sha256 = "sha256-vwjeWjIXQiFJ0o/wgEBrKP3hQi8Xa/azVS1IE/Q/MyY="; }; nativeBuildInputs = [ pkg-config ]; @@ -27,9 +27,9 @@ stdenv.mkDerivation { meta = with lib; { description = "Command line utlities for programming PCsensor and Scythe foot switches."; - homepage = "https://github.com/rgerganov/footswitch"; - license = licenses.mit; - platforms = platforms.linux; + homepage = "https://github.com/rgerganov/footswitch"; + license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ baloo ]; }; } From 365e8143d06cd330e60ede7df99c0c0f8f871589 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Mon, 11 Dec 2023 21:29:44 +0100 Subject: [PATCH 069/153] ngrok: 3.4.0 -> 3.5.0 --- pkgs/tools/networking/ngrok/versions.json | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/ngrok/versions.json b/pkgs/tools/networking/ngrok/versions.json index ef2b4e3d235d..3b52e8f92372 100644 --- a/pkgs/tools/networking/ngrok/versions.json +++ b/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", - "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/4gMs8FHXopG/ngrok-v3-3.5.0-linux-386", + "sha256": "2ab242193e01222d1c5cbfe85389200b97fc3af91374bd4b9c8d86812db7d589", + "version": "3.5.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", - "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/7qHLVJPrTcc/ngrok-v3-3.5.0-linux-amd64", + "sha256": "bd44f722df4435daf61c4bef4fe45d8abdbbf5ccd6c371b6ab405a07fb469c06", + "version": "3.5.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", - "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/ciuckTnS7RJ/ngrok-v3-3.5.0-linux-arm", + "sha256": "ba0ab1d956a0b05e35da6901691bd18166acc6a833c993e8f6b80f6d608e1d8c", + "version": "3.5.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", - "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/iutMKiLdVzF/ngrok-v3-3.5.0-linux-arm64", + "sha256": "85b5ecc96a56a1d19324acb3ca3a38e11a9075be8cb97ee466a1538f8711a69d", + "version": "3.5.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", - "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/hrb7DpXGSDS/ngrok-v3-3.5.0-darwin-amd64", + "sha256": "3380a2e742600fcef21e390291c4224e3e23fb31e832b695f922a24899125808", + "version": "3.5.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", - "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/aH6hGnhtNbT/ngrok-v3-3.5.0-darwin-arm64", + "sha256": "cbfd0bcd1d53aa1bc3b6afa54e0c8f01d77f6a369727f4f6eb1451b3a1eab3df", + "version": "3.5.0" } } From f4e620a33eadde0487bb5adb1669a97a87611685 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 070/153] howl: set meta.mainProgram --- pkgs/applications/editors/howl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 030c6666e11d..9406604413c4 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; maintainers = with maintainers; [ pacien ]; + mainProgram = "howl"; # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively platforms = [ "i686-linux" "x86_64-linux" ]; From 4e573fa355da0f677ba68206944a9076af832475 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 071/153] gscan2pdf: set meta.mainProgram --- pkgs/applications/graphics/gscan2pdf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 0acc934a7fd9..bbf52e105a28 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -153,5 +153,6 @@ perlPackages.buildPerlPackage rec { homepage = "https://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; + mainProgram = "gscan2pdf"; }; } From 1dfada3106469f6be4580c66bcb6b59779dcfb2b Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 072/153] urlscan: set meta.mainProgram --- pkgs/applications/misc/urlscan/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index e69b6330fef8..cd6964325106 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -39,5 +39,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/firecat53/urlscan/releases/tag/${version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dpaetzel ]; + mainProgram = "urlscan"; }; } From 01abc57bf356e8470a1b16f15c2ddd720eb95aad Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 073/153] notmuch-addrlookup: set meta.mainProgram --- .../networking/mailreaders/notmuch-addrlookup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 3ba78c743928..8fc12d5fd170 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mog ]; platforms = platforms.unix; license = licenses.mit; + mainProgram = "notmuch-addrlookup"; }; } From d67b73eba19f80ad0e3ac625224724344fb2b49a Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 074/153] notmuch: set meta.mainProgram --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 322bd2db903f..37c90f1b2f0f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -146,5 +146,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; + mainProgram = "notmuch"; }; } From 2320ecc51c69d5d83dcffa9fb60fd5ac2c8ef0b7 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 075/153] unison: set meta.mainProgram --- pkgs/applications/networking/sync/unison/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 10bc3ca68637..5245030fd7f3 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -71,5 +71,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; + mainProgram = "unison"; }; }) From 2cf28bb1bd0b385e02ec53372847b7dbbf51ef22 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:13 +0100 Subject: [PATCH 076/153] beamerpresenter: set meta.mainProgram --- pkgs/applications/office/beamerpresenter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/office/beamerpresenter/default.nix b/pkgs/applications/office/beamerpresenter/default.nix index cd640e89bf87..947c9946e5d3 100644 --- a/pkgs/applications/office/beamerpresenter/default.nix +++ b/pkgs/applications/office/beamerpresenter/default.nix @@ -90,5 +90,6 @@ stdenv.mkDerivation rec { license = with licenses; [ agpl3 gpl3Plus ]; platforms = platforms.all; maintainers = with maintainers; [ pacien dotlambda ]; + mainProgram = "beamerpresenter"; }; } From 2ffd71297ebc22a2c0fb26dfaa03d7e241a4618b Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:14 +0100 Subject: [PATCH 077/153] mdctags: set meta.mainProgram --- pkgs/development/tools/misc/mdctags/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/mdctags/default.nix b/pkgs/development/tools/misc/mdctags/default.nix index 7d8992b4e201..acd6d39e97f6 100644 --- a/pkgs/development/tools/misc/mdctags/default.nix +++ b/pkgs/development/tools/misc/mdctags/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/wsdjeg/mdctags.rs"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pacien ]; + mainProgram = "mdctags"; }; } From 4b1cb3475d7d03c25ed8ad5d834cfcdef1dbac16 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:14 +0100 Subject: [PATCH 078/153] matrix-appservice-discord: set meta.mainProgram --- pkgs/servers/matrix-appservice-discord/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix index b1d14319638d..605df82b5771 100644 --- a/pkgs/servers/matrix-appservice-discord/default.nix +++ b/pkgs/servers/matrix-appservice-discord/default.nix @@ -103,5 +103,6 @@ in mkYarnPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pacien ]; platforms = lib.platforms.linux; + mainProgram = "matrix-appservice-discord"; }; } From 53c19ef14dce40ba06bc9323dc271e0d73cfc2ef Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:14 +0100 Subject: [PATCH 079/153] rmfakecloud: set meta.mainProgram --- pkgs/servers/rmfakecloud/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/servers/rmfakecloud/default.nix index ada0ba0f03cf..46a6e4723a59 100644 --- a/pkgs/servers/rmfakecloud/default.nix +++ b/pkgs/servers/rmfakecloud/default.nix @@ -31,5 +31,6 @@ buildGoModule rec { homepage = "https://ddvk.github.io/rmfakecloud/"; license = licenses.agpl3Only; maintainers = with maintainers; [ pacien martinetd ]; + mainProgram = "rmfakecloud"; }; } From 960547b46f34c1c1bbf972de0c3b80847c2c5b0b Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:14 +0100 Subject: [PATCH 080/153] zrepl: set meta.mainProgram --- pkgs/tools/backup/zrepl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/zrepl/default.nix b/pkgs/tools/backup/zrepl/default.nix index 0a45c8c2aef1..b0e0f75fe8c6 100644 --- a/pkgs/tools/backup/zrepl/default.nix +++ b/pkgs/tools/backup/zrepl/default.nix @@ -45,5 +45,6 @@ buildGoModule rec { platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cole-h danderson mdlayher ]; + mainProgram = "zrepl"; }; } From 8a4824dbc6abf4f82c65f032ae9d3cc7b7ef8985 Mon Sep 17 00:00:00 2001 From: pacien Date: Mon, 11 Dec 2023 21:45:14 +0100 Subject: [PATCH 081/153] colordiff: set meta.mainProgram --- pkgs/tools/text/colordiff/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 4146429e2839..69473bd2c6f6 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "colordiff"; }; } From 37102defc876b2030e4365811de5a75075054704 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 20:51:01 +0000 Subject: [PATCH 082/153] fend: 1.3.2 -> 1.3.3 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 7abb37592c6a..82c99628e1b0 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-An1biuaqPeRniJZroxoT2o9IEA4XFf5l6ut4nmOsQJI="; + sha256 = "sha256-4N2MSs4Uhd0NcS57b6qIJd8ovnUVjLiLniMsHTdZHCo="; }; - cargoHash = "sha256-gnFu0JsMt1wMfifF6EnjDwwydFnVyqpkHV0cyR5Qt3Y="; + cargoHash = "sha256-Y8LfkFPM4MKxwW6xk93+vCASkVfsMp3GugjH/kIAvQ8="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 24f6a70f48fea36597495393f552209c644dba8a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:01:24 +0100 Subject: [PATCH 083/153] fasm: add missing phase hooks switch to `finalAttrs` pattern --- pkgs/development/compilers/fasm/bin.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index d33017517d2c..f23e9540928a 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -1,24 +1,28 @@ { stdenvNoCC, lib, fetchurl }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fasm-bin"; - version = "1.73.32"; src = fetchurl { - url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "sha256-WVXL4UNWXa9e7K3MSS0CXK3lczgog9V4XUoYChvvym8="; + url = "https://flatassembler.net/fasm-${finalAttrs.version}.tgz"; + hash = "sha256-WVXL4UNWXa9e7K3MSS0CXK3lczgog9V4XUoYChvvym8="; }; installPhase = '' + runHook preInstall + install -D fasm${lib.optionalString stdenvNoCC.isx86_64 ".x64"} $out/bin/fasm + + runHook postInstall ''; - meta = with lib; { + meta = { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; homepage = "https://flatassembler.net/download.php"; - license = licenses.bsd2; - maintainers = with maintainers; [ orivej ]; + license = lib.licenses.bsd2; + mainProgram = "fasm"; + maintainers = with lib.maintainers; [ orivej ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; -} +}) From 605197bd39e72d4ef81339b81a270e25198abff7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:06:26 +0100 Subject: [PATCH 084/153] dsdcc: use `finalAttrs` pattern --- pkgs/development/libraries/dsdcc/default.nix | 37 +++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/dsdcc/default.nix b/pkgs/development/libraries/dsdcc/default.nix index a64ddd94e505..9397c747e667 100644 --- a/pkgs/development/libraries/dsdcc/default.nix +++ b/pkgs/development/libraries/dsdcc/default.nix @@ -1,20 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, mbelib, serialdv +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, mbelib +, serialdv }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dsdcc"; version = "1.9.5"; src = fetchFromGitHub { owner = "f4exb"; repo = "dsdcc"; - rev = "v${version}"; - sha256 = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-DMCk29O2Lmt2tjo6j5e4ZdZeDL3ZFUh66Sm6TGrIaeU="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ mbelib serialdv ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + mbelib + serialdv + ]; cmakeFlags = [ "-DUSE_MBELIB=ON" @@ -25,11 +37,12 @@ stdenv.mkDerivation rec { --replace '=''${exec_prefix}//' '=/' ''; - meta = with lib; { + meta = { description = "Digital Speech Decoder (DSD) rewritten as a C++ library"; homepage = "https://github.com/f4exb/dsdcc"; - license = licenses.gpl3; - maintainers = with maintainers; [ alexwinter ]; - platforms = platforms.unix; + license = lib.licenses.gpl3; + mainProgram = "dsdccx"; + maintainers = with lib.maintainers; [ alexwinter ]; + platforms = lib.platforms.unix; }; -} +}) From 56583f0ac1faf524bb9302d4a0f56748aa662175 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 11 Dec 2023 22:11:31 +0100 Subject: [PATCH 085/153] aaaaxy: migrate to by-name --- .../{games/aaaaxy/default.nix => by-name/aa/aaaaxy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/aaaaxy/default.nix => by-name/aa/aaaaxy/package.nix} (100%) diff --git a/pkgs/games/aaaaxy/default.nix b/pkgs/by-name/aa/aaaaxy/package.nix similarity index 100% rename from pkgs/games/aaaaxy/default.nix rename to pkgs/by-name/aa/aaaaxy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea0977e6f527..2628d7d0a1be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37322,8 +37322,6 @@ with pkgs; _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; - aaaaxy = callPackage ../games/aaaaxy { }; - ace-of-penguins = callPackage ../games/ace-of-penguins { }; among-sus = callPackage ../games/among-sus { }; From 5a7c7f79a5674763d0fdfc125c18cb9d65fe0aef Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 11 Dec 2023 22:10:08 +0100 Subject: [PATCH 086/153] aaaaxy: 1.4.101 -> 1.4.119 https://github.com/divVerent/aaaaxy/releases/tag/v1.4.119 --- pkgs/by-name/aa/aaaaxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 3a5a0ecbbd09..fcd71f6c6615 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -19,17 +19,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.4.101"; + version = "1.4.119"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-Eg8RvViTPqlVmvUX3k+/ph4YYU7xfFQY1Gs/e1at6No="; + hash = "sha256-M+HNYQl53vQZdKn/CyF5OZPyKGq/4A9DPoDV3fRdWMY="; fetchSubmodules = true; }; - vendorHash = "sha256-Qd5ytSrW42pDzKt9xg3hWD9rWFvQi1PPYF+m56+/cHE="; + vendorHash = "sha256-NoWfCn9P/i/8Xv0w2wqTFG3yoayGzc1TyF02zANP7Rg="; buildInputs = [ alsa-lib From 4db77e5b1e619b8fddf8594f2d23140922f1a6fc Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 12 Dec 2023 00:20:09 +0300 Subject: [PATCH 087/153] iwd: revert test that's broken on aarch64-linux And maybe others --- pkgs/os-specific/linux/iwd/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 072254bc3336..84813723fb05 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchgit +, fetchpatch , autoreconfHook , pkg-config , ell @@ -21,6 +22,16 @@ stdenv.mkDerivation rec { hash = "sha256-zePFmcQRFjcH6KToTpBFMQzGY+Eq7jijfn0R/MMKGrw="; }; + # Revert test that's broken on aarch64 + # FIXME: fix this properly + patches = [ + (fetchpatch { + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=aabedeeb6c20c0c053f11ef53413d542442a8f62"; + revert = true; + hash = "sha256-hO4KzdLzW6Tn/4NNJEQO2OvgjSPVl46cwwZfv53R84U="; + }) + ]; + outputs = [ "out" "man" "doc" ] ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) "test"; From bd83c540917a575b40e9fefd9b3ae17707e7c84a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:25:27 +0100 Subject: [PATCH 088/153] subnetcalc: use `finalAttrs` pattern --- pkgs/tools/networking/subnetcalc/default.nix | 33 +++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/subnetcalc/default.nix b/pkgs/tools/networking/subnetcalc/default.nix index 18837785614a..e2d74a586d81 100644 --- a/pkgs/tools/networking/subnetcalc/default.nix +++ b/pkgs/tools/networking/subnetcalc/default.nix @@ -1,20 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subnetcalc"; version = "2.4.23"; src = fetchFromGitHub { owner = "dreibh"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; + repo = "subnetcalc"; + rev = "subnetcalc-${finalAttrs.version}"; + hash = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - meta = with lib; { + meta = { description = "SubNetCalc is an IPv4/IPv6 subnet address calculator"; + homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; + license = lib.licenses.gpl3Plus; longDescription = '' SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or IPv6 address and netmask or prefix length, it calculates network address, @@ -23,9 +33,8 @@ stdenv.mkDerivation rec { Furthermore, it prints useful information on specific address types (e.g. type, scope, interface ID, etc.). ''; - homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ atila ]; - platforms = platforms.unix; + mainProgram = "subnetcalc"; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.unix; }; -} +}) From edfbace3a5d6b774268b985703bf9f6ec762e4b3 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:34:35 +0100 Subject: [PATCH 089/153] zrok: use `finalAttrs` pattern --- pkgs/tools/networking/zrok/default.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index b6df1036122d..74fb313d9fc7 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchzip }: +{ lib +, stdenv +, fetchzip +}: let inherit (stdenv.hostPlatform) system; @@ -10,20 +13,20 @@ let armv7l-linux = "linux_armv7"; }.${system} or throwSystem; - sha256 = { + hash = { x86_64-linux = "sha256-vAX7vx13eHyPuDe4q5b8dQD90l5bbnncMGlXnegumxM="; aarch64-linux = "sha256-6x/E0uAPFOsuoJ/ePLV483M07Rqj5pkcpETOVq9RXKU="; armv7l-linux = "sha256-UlpqoKfjyGLNKvSrXqqsiiq/wTlfmBmPfynDoFT/nuQ="; }.${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zrok"; version = "0.4.18"; src = fetchzip { - url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; + url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; stripRoot = false; - inherit sha256; + inherit hash; }; updateScript = ./update.sh; @@ -31,19 +34,23 @@ stdenv.mkDerivation rec { installPhase = let interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; in '' + runHook preInstall + mkdir -p $out/bin cp zrok $out/bin/ chmod +x $out/bin/zrok patchelf --set-interpreter "${interpreter}" "$out/bin/zrok" + + runHook postInstall ''; meta = { description = "Geo-scale, next-generation sharing platform built on top of OpenZiti"; homepage = "https://zrok.io"; + license = lib.licenses.asl20; + mainProgram = "zrok"; maintainers = [ lib.maintainers.bandresen ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.asl20; }; - -} +}) From 37b35ccedb1f58c8c39bb2583d2026731d80f36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Mon, 11 Dec 2023 18:38:35 -0300 Subject: [PATCH 090/153] gnomeExtensions.valent: unstable-2023-03-18 -> unstable-2023-11-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/gnome/extensions/valent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/valent/default.nix b/pkgs/desktops/gnome/extensions/valent/default.nix index 3813e02ffc03..7bb529b743bb 100644 --- a/pkgs/desktops/gnome/extensions/valent/default.nix +++ b/pkgs/desktops/gnome/extensions/valent/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-valent"; - version = "unstable-2023-03-18"; + version = "unstable-2023-11-10"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-valent"; - rev = "e7f759047c45833cd211ef18a8554008cb1b8b12"; - hash = "sha256-ylCyQbFbzCuSM2YrLuI36eXL2qQjTt1mYewJlCywKvI="; + rev = "c0fad083db3c23382efca623488834054bbbd5cd"; + hash = "sha256-H0EjR7sYK0mepT59PoHgecbk4ksQN8Vyisf6Y+2vT8g="; }; nativeBuildInputs = [ From 507902558c92350919981c1a33d1928dd11446bc Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:40:52 +0100 Subject: [PATCH 091/153] zef: use `finalAttrs` pattern --- pkgs/development/interpreters/rakudo/zef.nix | 37 ++++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index ba7343a9f3ba..2ce4a164f7e6 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -1,35 +1,50 @@ -{ lib, stdenv, fetchFromGitHub, rakudo, makeWrapper }: +{ lib +, stdenv +, fetchFromGitHub +, rakudo +, makeBinaryWrapper +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zef"; version = "0.21.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; - rev = "v${version}"; - sha256 = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; + rev = "v${finalAttrs.version}"; + hash = "sha256-ji+KTxAOPZhuGryK0+svsVkU+HC1egKZWOboSBUON+s="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ rakudo ]; + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + buildInputs = [ + rakudo + ]; installPhase = '' + runHook preInstall + mkdir -p "$out" # TODO: Find better solution. zef stores cache stuff in $HOME with the # default config. env HOME=$TMPDIR ${rakudo}/bin/raku -I. ./bin/zef --/depends --/test-depends --/build-depends --install-to=$out install . + + runHook postInstall ''; postFixup ='' wrapProgram $out/bin/zef --prefix RAKUDOLIB , "inst#$out" ''; - meta = with lib; { + meta = { description = "Raku / Perl6 Module Management"; homepage = "https://github.com/ugexe/zef"; - license = licenses.artistic2; - platforms = platforms.unix; - maintainers = with maintainers; [ sgo ]; + license = lib.licenses.artistic2; + mainProgram = "zef"; + maintainers = with lib.maintainers; [ sgo ]; + platforms = lib.platforms.unix; }; -} +}) From 2eb4a346b5e22e57b1b7dd74aa54fba58b579d37 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 11 Dec 2023 22:44:42 +0100 Subject: [PATCH 092/153] vtm: use `finalAttrs` pattern --- pkgs/tools/misc/vtm/default.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index e56d79bb0c0e..47a78ea41ef6 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -4,27 +4,29 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vtm"; version = "0.9.27"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; - rev = "v${version}"; - sha256 = "sha256-BiXKwFZDi0boE1kCqbIn6uFjQ/oliyNbqmamyAwnqdM="; + rev = "v${finalAttrs.version}"; + hash = "sha256-BiXKwFZDi0boE1kCqbIn6uFjQ/oliyNbqmamyAwnqdM="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; cmakeFlags = [ "../src" ]; - meta = with lib; { + meta = { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ahuzik ]; + license = lib.licenses.mit; mainProgram = "vtm"; + maintainers = with lib.maintainers; [ ahuzik ]; + platforms = lib.platforms.all; }; -} +}) From 9cde600195e1be3043aedce087b6abaab2706eff Mon Sep 17 00:00:00 2001 From: emilylange Date: Mon, 11 Dec 2023 23:13:25 +0100 Subject: [PATCH 093/153] grafana-loki,promtail: 2.9.2 -> 2.9.3 https://github.com/grafana/loki/releases/tag/v2.9.3 https://github.com/grafana/loki/blob/v2.9.3/CHANGELOG.md diff: https://github.com/grafana/loki/compare/v2.9.2...v2.9.3 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index 72ffed83f37c..325909ad6686 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.9.2"; + version = "2.9.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${version}"; - hash = "sha256-CYF0cse8NyHEnSZPRI9LNI09vr7kWPXHNibiEbW484E="; + hash = "sha256-9EUlznnZczgHXUy784830FvUS6OwaFf7FmUJGeWeXP0="; }; vendorHash = null; From b9406abb698716b78c473d2c6e105187dfe78fff Mon Sep 17 00:00:00 2001 From: NixOS Date: Mon, 11 Dec 2023 23:30:01 +0100 Subject: [PATCH 094/153] tart: 2.4.1 -> 2.4.2 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index 6afe021c36c5..a72d7599e203 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz"; - sha256 = "sha256-dCKUwDC7M3u8/8yJQp/v0zy7GuB7SvjnRmTLtodUz80="; + sha256 = "sha256-4G6HAfCx7PzFGN0hc8g5z545ierogNyGwex7/+lDFSQ="; }; sourceRoot = "."; From 34b3fab6a292ed976addf2a6f4e0e2bd2276a420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 22:32:49 +0000 Subject: [PATCH 095/153] gensio: 2.7.7 -> 2.8.2 --- pkgs/development/libraries/gensio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 3dac6d6804e3..cd20eab42a62 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.7.7"; + version = "2.8.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fm850eDqKhvjwU5RwdwAro4R23yRn41ePn5++8MXHZ0="; + sha256 = "sha256-SwY9FAUljaxap2ZlPS3JJ8VkYiJFWoSLU1miEQIEerE="; }; passthru = { From 70efc8c72e4edc2e149be830443b2950e9ee199a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 11 Dec 2023 23:53:31 +0100 Subject: [PATCH 096/153] checkov: 3.1.31 -> 3.1.33 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.1.31...3.1.33 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.1.33 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index da1fec16d121..c1b57bab97e7 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.31"; + version = "3.1.33"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-XEkP9J9TkArbjoG/j54o2AxAd/2v60iJ8iQp28k9Pf0="; + hash = "sha256-NcjzKA/QvxIoZMzgMmyAQm4KI8kCsj+K9wcI1n+HPbc="; }; patches = [ From 6b9f45ae37450d224a89d072df672551ead5453a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 12 Dec 2023 12:05:34 +1300 Subject: [PATCH 097/153] python3.pkgs.buildsetupcfg: Remove function from python-packages-base.nix This function is not, and never have been, used anywhere inside nixpkgs, outside of bootstrapping setupcfg2nix itself. It was added in https://github.com/NixOS/nixpkgs/pull/38778 by @shlevy. It has no out-of-tree users on Github either. External breakage is not expected. --- pkgs/build-support/build-setupcfg/default.nix | 26 ------------------- .../python/python-packages-base.nix | 5 ---- .../tools/setupcfg2nix/default.nix | 13 ++++++---- pkgs/development/tools/setupcfg2nix/info.nix | 7 ----- 4 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 pkgs/build-support/build-setupcfg/default.nix delete mode 100644 pkgs/development/tools/setupcfg2nix/info.nix diff --git a/pkgs/build-support/build-setupcfg/default.nix b/pkgs/build-support/build-setupcfg/default.nix deleted file mode 100644 index 5737989249af..000000000000 --- a/pkgs/build-support/build-setupcfg/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# Build a python package from info made available by setupcfg2nix. -# -# * src: The source of the package. -# * info: The package information generated by setupcfg2nix. -# * meta: Standard nixpkgs metadata. -# * application: Whether this package is a python library or an -# application which happens to be written in python. -# * doCheck: Whether to run the test suites. -lib: pythonPackages: -{ src, info, meta ? {}, application ? false, doCheck ? true}: let - build = if application - then pythonPackages.buildPythonApplication - else pythonPackages.buildPythonPackage; -in build { - inherit (info) pname version; - - inherit src meta doCheck; - - nativeBuildInputs = map (p: pythonPackages.${p}) ( - (info.setup_requires or []) ++ - (lib.optionals doCheck (info.tests_require or [])) - ); - - propagatedBuildInputs = map (p: pythonPackages.${p}) - (info.install_requires or []); -} diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix index b5afaf34ce61..2126b796ca9d 100644 --- a/pkgs/development/interpreters/python/python-packages-base.nix +++ b/pkgs/development/interpreters/python/python-packages-base.nix @@ -47,9 +47,6 @@ let toPythonModule = x: x; # Application does not provide modules. })); - # See build-setupcfg/default.nix for documentation. - buildSetupcfg = import ../../../build-support/build-setupcfg lib self; - # Check whether a derivation provides a Python module. hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python; @@ -92,13 +89,11 @@ let disabledIf = x: drv: if x then disabled drv else drv; in { - inherit lib pkgs stdenv; inherit (python.passthru) isPy27 isPy37 isPy38 isPy39 isPy310 isPy311 isPy3k isPyPy pythonAtLeast pythonOlder; inherit buildPythonPackage buildPythonApplication; inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; - inherit buildSetupcfg; python = toPythonModule python; # Dont take pythonPackages from "global" pkgs scope to avoid mixing python versions diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 4cc1ec320ccd..f57e83db5551 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -1,14 +1,17 @@ -{ buildSetupcfg, fetchFromGitHub, lib }: +{ buildPythonApplication, fetchFromGitHub, lib, setuptools }: + +buildPythonApplication rec { + pname = "setupcfg2nix"; + version = "2.0.1"; + format = "setuptools"; -buildSetupcfg rec { - info = import ./info.nix; src = fetchFromGitHub { owner = "target"; repo = "setupcfg2nix"; - rev = info.version; + rev = version; sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; }; - application = true; + meta = { description = "Generate nix expressions from setup.cfg for a python package"; homepage = "https://github.com/target/setupcfg2nix"; diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix deleted file mode 100644 index 17e888fee416..000000000000 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - pname = "setupcfg2nix"; - version = "2.0.1"; - install_requires = [ - "setuptools" - ]; -} From ef2a69c86654a6eb682796ac0d30b85b34ac39d1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 12 Dec 2023 12:15:21 +1300 Subject: [PATCH 098/153] setupcfg2nix: Remove package It's unmaintained and the supporting build infrastructure was just removed from nixpkgs. --- .../tools/setupcfg2nix/default.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/development/tools/setupcfg2nix/default.nix diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix deleted file mode 100644 index f57e83db5551..000000000000 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonApplication, fetchFromGitHub, lib, setuptools }: - -buildPythonApplication rec { - pname = "setupcfg2nix"; - version = "2.0.1"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "target"; - repo = "setupcfg2nix"; - rev = version; - sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; - }; - - meta = { - description = "Generate nix expressions from setup.cfg for a python package"; - homepage = "https://github.com/target/setupcfg2nix"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ lib.maintainers.shlevy ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9466a2c52587..016c8a655020 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -859,6 +859,7 @@ mapAliases ({ sdlmame = throw "'sdlmame' has been renamed to/replaced by 'mame'"; # Converted to throw 2023-09-10 searx = throw "'searx' has been removed as it is unmaintained. Please switch to searxng"; # Added 2023-10-03 session-desktop-appimage = session-desktop; + setupcfg2nix = throw "'setupcfg2nix' has been removed. Please switch to buildPythonPackage"; # Added 2023-12-12 sequoia = sequoia-sq; # Added 2023-06-26 sexp = sexpp; # Added 2023-07-03 sget = throw "sget has been removed from nixpkgs, as it is not supported upstream anymore see https://github.com/sigstore/sget/issues/145"; # Added 2023-05-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18538c0d86fd..abc7d4eb9432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17936,8 +17936,6 @@ with pkgs; pypi-mirror = callPackage ../development/tools/pypi-mirror { }; - setupcfg2nix = python3Packages.callPackage ../development/tools/setupcfg2nix { }; - svg2tikz = with python3.pkgs; toPythonApplication svg2tikz; svg2pdf = callPackage ../tools/graphics/svg2pdf { }; From 1ee947324d9fe05e3075216887110cb8393059a0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Dec 2023 00:36:52 +0100 Subject: [PATCH 099/153] firefox-beta-unwrapped: 121.0b5 -> 121.0b9 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f43eaab9fa00..440d2ea117a1 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -33,11 +33,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "121.0b5"; + version = "121.0b9"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "1c9d2e8fe32687e95af5cf335ef219e70847977568ca636a322c2804f6408d054236df4196e03fc666ac3245ca4a3a9785caf56e1d928a1850f4b34ab5237f8c"; + sha512 = "a107ba7127f40763325335136c5aeaf6d873dd9ca1c8ca95d93e96b377b41a0974056c84e8323c51ed57e01a2e4ef9996ef2ee2d804053aa2226bd837026523a"; }; meta = { From 25c572781264fcb0897a9b2c3050f980e3391933 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Dec 2023 00:37:23 +0100 Subject: [PATCH 100/153] firefox-devedition-unwrapped: 121.0b5 -> 121.0b9 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 440d2ea117a1..cd5b7742c6d6 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -62,13 +62,13 @@ firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; - version = "121.0b5"; + version = "121.0b9"; applicationName = "Mozilla Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "cf23b18abece88f4cee418892791a8a4076ccc14cfe0f1d58f9284ec72f109e44a5397a88b4350f963a3e02e53dd91d7b777c36debd9a3621081499519659f6e"; + sha512 = "732c2b3f1e47512bee9af696e8763ce13b39497a6ec9af0de9904ce4f55b03bc799e628e17e84ce7062ebd5a7dc50290fbbfa17b0f41622ce5088f1d548897b5"; }; meta = { From a8ecd7a07a37f52f6827ac964353329ba9001649 Mon Sep 17 00:00:00 2001 From: arthsmn Date: Sun, 10 Dec 2023 14:04:48 -0300 Subject: [PATCH 101/153] mpvScripts.sponsorblock-minimal: init at unstable-2023-08-20 --- .../video/mpv/scripts/default.nix | 1 + .../mpv/scripts/sponsorblock-minimal.nix | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix diff --git a/pkgs/applications/video/mpv/scripts/default.nix b/pkgs/applications/video/mpv/scripts/default.nix index 4083c52b3d90..4ca70c401fa8 100644 --- a/pkgs/applications/video/mpv/scripts/default.nix +++ b/pkgs/applications/video/mpv/scripts/default.nix @@ -20,6 +20,7 @@ in lib.recurseIntoAttrs quality-menu = callPackage ./quality-menu.nix { inherit buildLua; }; simple-mpv-webui = callPackage ./simple-mpv-webui.nix { inherit buildLua; }; sponsorblock = callPackage ./sponsorblock.nix { }; + sponsorblock-minimal = callPackage ./sponsorblock-minimal.nix { inherit buildLua; }; thumbfast = callPackage ./thumbfast.nix { inherit buildLua; }; thumbnail = callPackage ./thumbnail.nix { inherit buildLua; }; uosc = callPackage ./uosc.nix { inherit buildLua; }; diff --git a/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix new file mode 100644 index 000000000000..f7f8049cbba3 --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/sponsorblock-minimal.nix @@ -0,0 +1,32 @@ +{ lib +, buildLua +, fetchFromGitea +, curl +}: + +buildLua { + pname = "mpv_sponsorblock_minimal"; + version = "unstable-2023-08-20"; + scriptPath = "sponsorblock_minimal.lua"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "jouni"; + repo = "mpv_sponsorblock_minimal"; + rev = "ca2844b8cf7674bfccd282d389a50427742251d3"; + hash = "sha256-28HWZ6nOhKiE+5Ya1N3Vscd8aeH9OKS0t72e/xPfFQQ="; + }; + + preInstall = '' + substituteInPlace sponsorblock_minimal.lua \ + --replace "curl" "${lib.getExe curl}" + ''; + + meta = with lib; { + description = "A minimal script to skip sponsored segments of YouTube videos"; + homepage = "https://codeberg.org/jouni/mpv_sponsorblock_minimal"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ arthsmn ]; + }; +} From baed870448c01b07b2799401ce546ed80cc99693 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 9 Dec 2023 10:15:45 -0800 Subject: [PATCH 102/153] clisp: fix build Without this patch, the following build error occurs for me on NixOS: ``` $ nix-build -A clisp --check Running phase: buildPhase build flags: SHELL=/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash ln -s ../src/.gdbinit .gdbinit rm -f build-aux ln -s ../src/build-aux build-aux mkdir -p gllib test -f gllib/Makefile || sh config.status gllib/Makefile depfiles cd gllib && make CFLAGS="-g -O2 -no-integrated-cpp -W -Wswitch -Wcomment -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wimplicit -Wno-sign-compare -Wno-format-nonliteral -Wno-shift-negative-value -O -fwrapv -pthread -fno-strict-aliasing -DNO_ASM -DENABLE_UNICODE -DMULTITHREAD -DPOSIX_THREADS -DDYNAMIC_FFI -DDYNAMIC_MODULES -fPIC -DPIC " top_srcdir="/build/source/src" make[1]: Entering directory '/build/source/builddir/gllib' cd /build/source/src && /nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash /build/source/src/build-aux/missing automake-1.16 --gnits gllib/Makefile /build/source/src/build-aux/missing: line 81: automake-1.16: command not found WARNING: 'automake-1.16' is missing on your system. You should only need it if you modified 'Makefile.am' or 'configure.ac' or m4 files included by 'configure.ac'. The 'automake' program is part of the GNU Automake package: It also requires GNU Autoconf, GNU m4 and Perl in order to run: make[1]: *** [Makefile:1333: ../../src/gllib/Makefile.in] Error 127 make[1]: Leaving directory '/build/source/builddir/gllib' make: *** [Makefile:648: gllib/libgnu.a] Error 2 ``` This message was also reproduced by @2xsaiko on their NAS machine. I don't know why this error sometimes occurs and sometimes does not. On my Ubuntu machines, this error does not occur, and instead it does this: ``` Running phase: buildPhase build flags: SHELL=/nix/store/q8qq40xg2grfh9ry1d9x4g7lq4ra7n81-bash-5.2-p21/bin/bash ln -s ../src/.gdbinit .gdbinit rm -f build-aux ln -s ../src/build-aux build-aux mkdir -p gllib test -f gllib/Makefile || sh config.status gllib/Makefile depfiles cd gllib && make CFLAGS="-g -O2 -no-integrated-cpp -W -Wswitch -Wcomment -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wimplicit -Wno-sign-compare -Wno-format-nonliteral -Wno-shift-negative-value -O -fwrapv -pthread -fno-strict-aliasing -DNO_ASM -DENABLE_UNICODE -DMULTITHREAD -DPOSIX_THREADS -DDYNAMIC_FFI -DDYNAMIC_MODULES -fPIC -DPIC " top_srcdir="/build/source/src" make[1]: Entering directory '/build/source/builddir/gllib' make[2]: Entering directory '/build/source/builddir' make[2]: Nothing to be done for 'am--refresh'. make[2]: Leaving directory '/build/source/builddir' cd .. && make am--refresh make[2]: Entering directory '/build/source/builddir' make[2]: Nothing to be done for 'am--refresh'. make[2]: Leaving directory '/build/source/builddir' ``` In any case, these changes work successfully on all platforms I've tested them on: 1. NixOS 2. Ubuntu 22.04 3. MacOS x86_64 4. MacOS aarch64 --- pkgs/development/interpreters/clisp/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 127541c727ec..0ff0f6a49816 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { }; strictDeps = true; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ autoconf269 automake libtool ]; + nativeBuildInputs = [ autoconf269 automake libtool ]; buildInputs = [libsigsegv] ++ lib.optional (gettext != null) gettext ++ lib.optional (ncurses != null) ncurses @@ -81,6 +81,7 @@ stdenv.mkDerivation { postPatch = '' sed -e 's@9090@64237@g' -i tests/socket.tst sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + sed -i 's@1\.16\.2@${automake.version}@' src/aclocal.m4 find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i ''; From 8f47b402467967a4bf02ed72045544100baa2a5d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 11 Dec 2023 19:46:35 -0500 Subject: [PATCH 103/153] yoda: 1.9.8 -> 1.9.9 (#273260) --- .../development/libraries/physics/yoda/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index da6c21db0ff0..68f4e3714e09 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , python , root , makeWrapper @@ -11,22 +10,13 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-e8MGJGirulCv8+y4sizmdxlgNgCYkGiO9FM6qn+S5uQ="; + hash = "sha256-68rVU2mhztzuOi3gWUB8hRZSukRJURP1wJ2MLlf1Fqo="; }; - patches = [ - # A bugfix https://gitlab.com/hepcedar/yoda/-/merge_requests/116 - (fetchpatch { - url = "https://gitlab.com/hepcedar/yoda/-/commit/ba1275033522c66bc473dfeffae1a7971e985611.diff"; - hash = "sha256-/8UJuypiQzywarE+o3BEMtqM+f+YzkHylugi+xTJf+w="; - excludes = [ "ChangeLog" ]; - }) - ]; - nativeBuildInputs = with python.pkgs; [ cython makeWrapper From 9ea88b16b1db75f093bd2b896d86c256d4dc37f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 11 Dec 2023 13:25:35 +0000 Subject: [PATCH 104/153] erigon: 2.54.0 -> 2.55.1 --- pkgs/applications/blockchains/erigon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index d73a916b0de3..ae77b64c7b04 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.54.0"; + version = "2.55.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-1kgbIg/3SvVT83UfwAYUixs1RQk4PP1quiOcI1mzbZ0="; + hash = "sha256-ttBJIx2QR3H5JFyquoGwZpWwT10r7X7GnGE4uEzuRZA="; fetchSubmodules = true; }; - vendorHash = "sha256-Gr9mrME8/ZDxp2ORKessNhfguklDf+jC4RSpzLOSBhQ="; + vendorHash = "sha256-QLuWxec1gwMnVo0Zw8z4Ef8vzxc4xFpLL/TT986Sljo="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From e5b36cce123b6bc04d64ee532476304c25bd1e93 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:07:15 +0100 Subject: [PATCH 105/153] gsmlib: drop stdenv override --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c80308d1b9a..c685bedfbb54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8983,7 +8983,7 @@ with pkgs; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { }; gsmlib = callPackage ../development/libraries/gsmlib - { stdenv = gcc10StdenvCompat; autoreconfHook = buildPackages.autoreconfHook269; }; + { autoreconfHook = buildPackages.autoreconfHook269; }; gssdp = callPackage ../development/libraries/gssdp { }; From 3f718ad2477803c2c448dc1ce8b300f2a71bcdbf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:10:57 +0100 Subject: [PATCH 106/153] mkcue: fix build with gcc 11+ --- pkgs/tools/cd-dvd/mkcue/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/cd-dvd/mkcue/default.nix b/pkgs/tools/cd-dvd/mkcue/default.nix index 575adecbd521..34893b9f68a5 100644 --- a/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/pkgs/tools/cd-dvd/mkcue/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra"; }; + env.CXXFLAGS = "-std=c++98"; + preInstall = "mkdir -pv $out/bin"; postInstall = "chmod -v +w $out/bin/mkcue"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c80308d1b9a..96293a42bcae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10939,7 +10939,7 @@ with pkgs; mkclean = callPackage ../applications/video/mkclean { }; - mkcue = callPackage ../tools/cd-dvd/mkcue { stdenv = gcc10StdenvCompat; }; + mkcue = callPackage ../tools/cd-dvd/mkcue { }; mkp224o = callPackage ../tools/security/mkp224o { }; From 7fa100cdb694e572c416774f4970123e8c7a6b10 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:15:30 +0100 Subject: [PATCH 107/153] xc3sprog: fix build with gcc 11+ --- pkgs/development/embedded/xc3sprog/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/xc3sprog/default.nix b/pkgs/development/embedded/xc3sprog/default.nix index 393a11f8a448..fa9ceffafbbb 100644 --- a/pkgs/development/embedded/xc3sprog/default.nix +++ b/pkgs/development/embedded/xc3sprog/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" + # fix build with gcc 11+ + "-DCMAKE_CXX_STANDARD=14" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c80308d1b9a..890b6b4da2d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20389,7 +20389,7 @@ with pkgs; lua = lua5_4; }; - xc3sprog = callPackage ../development/embedded/xc3sprog { stdenv = gcc10StdenvCompat; }; + xc3sprog = callPackage ../development/embedded/xc3sprog { }; xcb-imdkit = callPackage ../development/libraries/xcb-imdkit { }; From f6da64f8dbd835774998ac336933d2a0147fa310 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:28:36 +0100 Subject: [PATCH 108/153] llvmPackages_17.libclc: init --- pkgs/development/compilers/llvm/16/default.nix | 2 +- pkgs/development/compilers/llvm/17/default.nix | 6 ++++++ .../llvm/{16/libclc/default.nix => common/libclc.nix} | 5 ++--- .../{16 => common}/libclc/libclc-gnu-install-dirs.patch | 0 4 files changed, 9 insertions(+), 4 deletions(-) rename pkgs/development/compilers/llvm/{16/libclc/default.nix => common/libclc.nix} (93%) rename pkgs/development/compilers/llvm/{16 => common}/libclc/libclc-gnu-install-dirs.patch (100%) diff --git a/pkgs/development/compilers/llvm/16/default.nix b/pkgs/development/compilers/llvm/16/default.nix index 5ecb89a3a264..580821cc0d2c 100644 --- a/pkgs/development/compilers/llvm/16/default.nix +++ b/pkgs/development/compilers/llvm/16/default.nix @@ -281,7 +281,7 @@ in let # Has to be in tools despite mostly being a library, # because we use a native helper executable from a # non-cross build in cross builds. - libclc = callPackage ./libclc { + libclc = callPackage ../common/libclc.nix { inherit buildLlvmTools; }; }); diff --git a/pkgs/development/compilers/llvm/17/default.nix b/pkgs/development/compilers/llvm/17/default.nix index 8109f27586cb..2c422da8f9f8 100644 --- a/pkgs/development/compilers/llvm/17/default.nix +++ b/pkgs/development/compilers/llvm/17/default.nix @@ -269,6 +269,12 @@ in let nixSupport.cc-cflags = [ "-fno-exceptions" ]; }); + # Has to be in tools despite mostly being a library, + # because we use a native helper executable from a + # non-cross build in cross builds. + libclc = callPackage ../common/libclc.nix { + inherit buildLlvmTools; + }; }); libraries = lib.makeExtensible (libraries: let diff --git a/pkgs/development/compilers/llvm/16/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc.nix similarity index 93% rename from pkgs/development/compilers/llvm/16/libclc/default.nix rename to pkgs/development/compilers/llvm/common/libclc.nix index 2ceca9aaf7fd..c91930963b20 100644 --- a/pkgs/development/compilers/llvm/16/libclc/default.nix +++ b/pkgs/development/compilers/llvm/common/libclc.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; patches = [ - ./libclc-gnu-install-dirs.patch + ./libclc/libclc-gnu-install-dirs.patch ]; # cmake expects all required binaries to be in the same place, so it will not be able to find clang without the patch @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { --replace 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ 'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \ --replace 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \ - 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator}/bin" NO_DEFAULT_PATH )' + 'find_program( LLVM_SPIRV llvm-spirv PATHS "${buildPackages.spirv-llvm-translator.override { inherit (buildLlvmTools) llvm; }}/bin" NO_DEFAULT_PATH )' '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace CMakeLists.txt \ --replace 'COMMAND prepare_builtins' 'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins' @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; diff --git a/pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch b/pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch similarity index 100% rename from pkgs/development/compilers/llvm/16/libclc/libclc-gnu-install-dirs.patch rename to pkgs/development/compilers/llvm/common/libclc/libclc-gnu-install-dirs.patch From e580e17a779587fdaa1c9001e633f5b9ab9e8354 Mon Sep 17 00:00:00 2001 From: Fiona Weber Date: Tue, 12 Dec 2023 01:43:24 +0000 Subject: [PATCH 109/153] tor: 0.4.8.9 -> 0.4.8.10 --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 34088e3afbc6..5fc68c0a1c29 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.9"; + version = "0.4.8.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; + sha256 = "sha256-5ii0+rcO20cncVsjzykxN1qfdoWsCPLFnqSYoXhGOoY="; }; outputs = [ "out" "geoip" ]; From 97fddea6268202698b2c321a5aa379baa2403023 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 02:43:41 +0100 Subject: [PATCH 110/153] libsForQt5.phonon: fix build on darwin --- pkgs/development/libraries/phonon/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index dc95b4ed8266..dd20b6dcebe6 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -50,7 +50,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - env.NIX_CFLAGS_COMPILE = "-fPIC"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-fPIC" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); cmakeBuildType = if debug then "Debug" else "Release"; From b576bc2681ccc45a341f8dafa3361fe4e6bbfd1f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 11 Dec 2023 21:22:33 -0500 Subject: [PATCH 111/153] apfel: 3.0.6 -> 3.1.0 (#273073) --- .../libraries/physics/apfel/cmake.patch | 14 +++++ .../libraries/physics/apfel/default.nix | 51 +++++++++++++++---- 2 files changed, 55 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/libraries/physics/apfel/cmake.patch diff --git a/pkgs/development/libraries/physics/apfel/cmake.patch b/pkgs/development/libraries/physics/apfel/cmake.patch new file mode 100644 index 000000000000..5bc342aeb48c --- /dev/null +++ b/pkgs/development/libraries/physics/apfel/cmake.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,8 +46,8 @@ message(STATUS "APFEL: APFEL_DOWNLOAD_PDFS=${APFEL_DOWNLOAD_PDFS}") + # CONFIG SCRIPT ======================================================== + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix "${prefix}") +-set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +-set(libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}") ++set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") ++set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") + set(PACKAGE_VERSION "${apfel_VERSION}") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel-config.in" "${PROJECT_BINARY_DIR}/bin/apfel-config") + configure_file("${PROJECT_SOURCE_DIR}/bin/apfel.in" "${PROJECT_BINARY_DIR}/bin/apfel") diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index c0860d9a1baf..ae48fb90ac83 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -1,28 +1,59 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gfortran, lhapdf, python3, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gfortran +, lhapdf +, python3 +, swig +, zlib +}: stdenv.mkDerivation rec { pname = "apfel"; - version = "3.0.6"; + version = "3.1.0"; src = fetchFromGitHub { owner = "scarrazza"; repo = "apfel"; rev = version; - sha256 = "sha256-fRdJ+C92tEC75iUwP9Tmm/EswrlA52eUo5fBjfieH9o="; + hash = "sha256-RXzHcLgitIk+6pINqcvpQv7QpDpAuFrOHKqjwZ0K5zI="; }; - # needed for aarch64-darwin - nativeBuildInputs = [ autoreconfHook ]; + patches = [ + # https://github.com/scarrazza/apfel/pull/54 + ./cmake.patch + ]; - buildInputs = [ gfortran lhapdf python3 zlib ]; + nativeBuildInputs = [ + cmake + swig + ]; + buildInputs = [ + gfortran + lhapdf + python3 + zlib + ]; - enableParallelBuilding = true; + cmakeFlags = [ + "-DAPFEL_DOWNLOAD_PDFS=OFF" + "-DAPFEL_Python_SITEARCH=autoprefix" + ]; + + doCheck = true; + nativeCheckInputs = [ + lhapdf.pdf_sets.NNPDF23_nlo_as_0118 + lhapdf.pdf_sets.NNPDF31_nnlo_as_0118 + ]; + + env.NIX_CFLAGS_COMPILE = "-DAPFEL_VERSION=${version}"; meta = with lib; { description = "A PDF Evolution Library"; - license = licenses.gpl3Plus; - homepage = "https://apfel.mi.infn.it/"; - platforms = platforms.unix; + homepage = "https://apfel.mi.infn.it/"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; }; } From 528365383f85194ac9b330534cc2aaf9b7969f8f Mon Sep 17 00:00:00 2001 From: Kyle Hendricks Date: Tue, 5 Dec 2023 21:47:43 -0500 Subject: [PATCH 112/153] gasket: 1.0-18 -> 1.0-18-unstable-2023-09-05 Diff: https://github.com/google/gasket-driver/compare/97aeba..09385d Most importantly, this fixes building on kernels >= 6.4. --- pkgs/os-specific/linux/gasket/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/gasket/default.nix b/pkgs/os-specific/linux/gasket/default.nix index c0790ae6a278..b9aebacca641 100644 --- a/pkgs/os-specific/linux/gasket/default.nix +++ b/pkgs/os-specific/linux/gasket/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gasket"; - version = "1.0-18"; + version = "1.0-18-unstable-2023-09-05"; src = fetchFromGitHub { owner = "google"; repo = "gasket-driver"; - rev = "97aeba584efd18983850c36dcf7384b0185284b3"; - sha256 = "pJwrrI7jVKFts4+bl2xmPIAD01VKFta2SRuElerQnTo="; + rev = "09385d485812088e04a98a6e1227bf92663e0b59"; + sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4="; }; makeFlags = [ From 18523dedab7742c80abf1cef31c49f8f2884625a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Dec 2023 04:08:43 +0100 Subject: [PATCH 113/153] release-python.nix: allow evaluation with openssl_1_1 Home Assistant is a big part of nixpkgs python ecosystem and how I started participating in python maintenance. Recently it started including `openssl_1_1` in its transitive dependency closure, which resulted in its exclusion from python-updates. This is detrimental to the health of the `home-assistant` ecosystem, since it would not be built and tested anymore. Permitting `openssl_1_1` for python-updates, as was done for `release.nix`, will allow me to get in contact with the upstream, to hopefully arrive at a favorable outcome. --- pkgs/top-level/release-python.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 33080d5620f0..d1baf51745c7 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -9,7 +9,17 @@ "x86_64-linux" ] , # Attributes passed to nixpkgs. Don't build packages marked as unfree. - nixpkgsArgs ? { config = { allowUnfree = false; inHydra = true; }; } + nixpkgsArgs ? { config = { + allowUnfree = false; + allowInsecure = false; + inHydra = true; + permittedInsecurePackages = [ + # Keep evaluating home-assistant, which is transitively affected + # by home-assistant-chip-core consuming OpenSSL 1.1. Affects roughly + # 800 jobs. + "openssl-1.1.1w" + ]; + }; } }: with import ./release-lib.nix {inherit supportedSystems nixpkgsArgs; }; From 48fd74ccdf9e83eca9e8e40d26b6726cd5323731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Dec 2023 21:57:10 -0800 Subject: [PATCH 114/153] imagemagick: 7.1.1-21 -> 7.1.1-23 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-21...7.1.1-23 Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index d248b845ddf0..3bc649490ffd 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-21"; + version = "7.1.1-23"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-DqVonNh6bFNK91Pd6MwIO1yMrshfGAWNWPpHHQUA2sQ="; + hash = "sha256-ytDMCZN+vavOtiPju5z87nJmSafRTt1gGycZtl3seGI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 5d43a8764fa6b933eb01b8bb0f4bd253226bf261 Mon Sep 17 00:00:00 2001 From: larsr Date: Tue, 12 Dec 2023 07:19:37 +0100 Subject: [PATCH 115/153] coqPackages.metacoq: update for coq 8.17 and 8.18 (#273541) Also update default.nix to match the default.nix in MetaCoq/metacoq:.nix/coq-overlays/metacoq/default.nix Because some files have changed names, some version-dependent building is required to keep building older versions. And Metacoq's default.nix had older version checksums. We use the more recent versions from nixpkgs for coq 8.14-8.16 Co-authored-by: Lars Rasmusson --- .../coq-modules/metacoq/default.nix | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix index 9ab49f8e0861..5695bcf2ee99 100644 --- a/pkgs/development/coq-modules/metacoq/default.nix +++ b/pkgs/development/coq-modules/metacoq/default.nix @@ -5,7 +5,7 @@ with builtins // lib; let repo = "metacoq"; owner = "MetaCoq"; - defaultVersion = with versions; lib.switch coq.coq-version [ + defaultVersion = with versions; switch coq.coq-version [ { case = "8.11"; out = "1.0-beta2-8.11"; } { case = "8.12"; out = "1.0-beta2-8.12"; } # Do not provide 8.13 because it does not compile with equations 1.3 provided by default (only 1.2.3) @@ -13,6 +13,8 @@ let { case = "8.14"; out = "1.1-8.14"; } { case = "8.15"; out = "1.1-8.15"; } { case = "8.16"; out = "1.1-8.16"; } + { case = "8.17"; out = "1.2.1-8.17"; } + { case = "8.18"; out = "1.2.1-8.18"; } ] null; release = { "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs="; @@ -24,11 +26,15 @@ let "1.1-8.14".sha256 = "sha256-6vViCNQl6BnGgOHX3P/OLfFXN4aUfv4RbDokfz2BgQI="; "1.1-8.15".sha256 = "sha256-qCD3wFW4E+8vSVk4XoZ0EU4PVya0al+JorzS9nzmR/0="; "1.1-8.16".sha256 = "sha256-cTK4ptxpPPlqxAhasZFX3RpSlsoTZwhTqs2A3BZy9sA="; + "1.2.1-8.17".sha256 = "sha256-FP4upuRsG8B5Q5FIr76t+ecRirrOUX0D1QiLq0/zMyE="; + "1.2.1-8.18".sha256 = "sha256-49g5db2Bv8HpltptJdxA7zrmgNFGC6arx5h2mKHhrko="; }; releaseRev = v: "v${v}"; # list of core metacoq packages sorted by dependency order - packages = [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; + packages = if versionAtLeast coq.coq-version "8.17" + then [ "utils" "common" "template-coq" "pcuic" "safechecker" "template-pcuic" "erasure" "quotation" "safechecker-plugin" "erasure-plugin" "all" ] + else [ "template-coq" "pcuic" "safechecker" "erasure" "all" ]; template-coq = metacoq_ "template-coq"; @@ -47,7 +53,16 @@ let mlPlugin = true; propagatedBuildInputs = [ equations coq.ocamlPackages.zarith ] ++ metacoq-deps; - patchPhase = '' + patchPhase = if versionAtLeast coq.coq-version "8.17" then '' + patchShebangs ./configure.sh + patchShebangs ./template-coq/update_plugin.sh + patchShebangs ./template-coq/gen-src/to-lower.sh + patchShebangs ./safechecker-plugin/clean_extraction.sh + patchShebangs ./erasure-plugin/clean_extraction.sh + echo "CAMLFLAGS+=-w -60 # Unused module" >> ./safechecker/Makefile.plugin.local + sed -i -e 's/mv $i $newi;/mv $i tmp; mv tmp $newi;/' ./template-coq/gen-src/to-lower.sh ./safechecker-plugin/clean_extraction.sh ./erasure-plugin/clean_extraction.sh + '' else '' + patchShebangs ./configure.sh patchShebangs ./template-coq/update_plugin.sh patchShebangs ./template-coq/gen-src/to-lower.sh patchShebangs ./pcuic/clean_extraction.sh @@ -59,7 +74,7 @@ let configurePhase = optionalString (package == "all") pkgallMake + '' touch ${pkgpath}/metacoq-config - '' + optionalString (elem package ["safechecker" "erasure"]) '' + '' + optionalString (elem package ["safechecker" "erasure" "template-pcuic" "quotation" "safechecker-plugin" "erasure-plugin"]) '' echo "-I ${template-coq}/lib/coq/${coq.coq-version}/user-contrib/MetaCoq/Template/" > ${pkgpath}/metacoq-config '' + optionalString (package == "single") '' ./configure.sh local From e490b9f91777f50a30dc9185042deef1f3e8ae62 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Tue, 12 Dec 2023 09:53:09 +1000 Subject: [PATCH 116/153] terragrunt: 0.54.0 -> 0.54.1 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 25abb629cdf0..20c5249ab753 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.54.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-PcQuPV0wZa+CgikI9grdsGqNwXlXnu/kM+h4KfPW7SU="; + hash = "sha256-BbJ8XJ2zdKm1awDEkWZIZMDku/NWN3Y+nl/GtBBHgBQ="; }; vendorHash = "sha256-OIkrDvNk4XD11j/+BdOkzbw86cYUj0Vz7pZ5/vIZopY="; From 73a4603df849e21ec7a792e99dd12868c3bbded3 Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 7 Dec 2023 13:10:01 +0100 Subject: [PATCH 117/153] clickhouse: 23.10.3.5 -> 23.11.1.2711 --- pkgs/servers/clickhouse/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 19a0b5e92340..629842669388 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -28,7 +28,7 @@ let else llvmPackages.stdenv).mkDerivation; in mkDerivation rec { pname = "clickhouse"; - version = "23.10.3.5"; + version = "23.11.1.2711"; src = fetchFromGitHub rec { owner = "ClickHouse"; @@ -36,7 +36,7 @@ in mkDerivation rec { rev = "v${version}-stable"; fetchSubmodules = true; name = "clickhouse-${rev}.tar.gz"; - hash = "sha256-H3nIhBydLBxSesGrvqmwHmBoQGCGQlWgVVUudKLLkIY="; + hash = "sha256-xRg9NzUkjTbR2Lp6DgDzcUp2Hrc4sfgkot7KxPw2Uy8="; postFetch = '' # delete files that make the source too big rm -rf $out/contrib/llvm-project/llvm/test @@ -61,6 +61,20 @@ in mkDerivation rec { ''; }; + patches = [ + # They updated the Cargo.toml without updating the Cargo.lock :/ + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/bccd33932b5fe17ced2dc2f27813da0b1c034afa.patch"; + revert = true; + hash = "sha256-4idwr+G8WGuT/VILKtDIJIvbCvi6pZokJFze4dP6ExE="; + }) + (fetchpatch { + url = "https://github.com/ClickHouse/ClickHouse/commit/b6bd5ecb199ef8a10e3008a4ea3d96087db8a8c1.patch"; + revert = true; + hash = "sha256-nbb/GV2qWEZ+BEfT6/9//yZf4VWdhOdJCI3PLeh6o0M="; + }) + ]; + strictDeps = true; nativeBuildInputs = [ cmake From 59b11ff3322e69c660ada4271aae317955ef0810 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Dec 2023 08:23:09 +0100 Subject: [PATCH 118/153] exploitdb: 2023-12-07 -> 2023-12-12 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-12-07...2023-12-12 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ff1b798a59b3..123c5ba74c32 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-12-07"; + version = "2023-12-12"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-aN98whcpb3XMXWNFM0ynhcu6CmVdEXNDvtRE98mJSMA="; + hash = "sha256-OHx9UV5IhNt9/jKUKAzAUILdjxpQgOe5BQdXz3k38RE="; }; nativeBuildInputs = [ From 7167c7ce4c3dbf4e0cd7a0f225d6ef4d05d00da3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Dec 2023 08:24:56 +0100 Subject: [PATCH 119/153] python311Packages.dvc-data: 2.22.6 -> 2.23.1 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/2.22.6...2.23.1 Changelog: https://github.com/iterative/dvc-data/releases/tag/2.23.1 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index edfad3b6c247..3deec8ee65de 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "2.22.6"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; rev = "refs/tags/${version}"; - hash = "sha256-oHW80TqQe7LCvBpdB0kW8+vKCZ36/zXEssp7+kHUrTA="; + hash = "sha256-UsWMlwG1g59I+TIn1uwp6vyzVIBtj1lfchp+3SYognc="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From f908761f4f40b51a71f325ede4859fb2edc0b8f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 12 Dec 2023 09:18:30 +0100 Subject: [PATCH 120/153] python311Packages.awscrt: 0.19.18 -> 0.19.19 Changelog: https://github.com/awslabs/aws-crt-python/releases/tag/v0.19.19 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 9d739c81f700..dc499f2bcb6c 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.19.18"; + version = "0.19.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NQtu/Y6+4ILqPz5SxZo8PsWUza8B24tIU9zrn+yQyJ0="; + hash = "sha256-HBURU13uFGpsJqOC7T6tViWaEFs7fX2CNVOuVn0Djf4="; }; buildInputs = lib.optionals stdenv.isDarwin [ From a59c7364955e5f32798d0314fbb6aae347ff064d Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 11 Dec 2023 16:59:28 +0100 Subject: [PATCH 121/153] warzone2100: fix fetch url The previous url always redirects to the latest version. See #272701 and https://github.com/Warzone2100/warzone2100/issues/3565. --- pkgs/games/warzone2100/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 5dc2f6d4b8bb..efcc5c4c640f 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { version = "4.4.1"; src = fetchurl { - url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; + url = "mirror://sourceforge/project/warzone2100/releases/${version}/warzone2100_src.tar.xz"; hash = "sha256-8vbwO4PXEOyZqGiSz1yqhe8jfe4E4iv908mc+8xuH8I="; }; From 324c7bbda1f320e5a9bb64cfcde2882a3c5c75af Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:33:00 +0100 Subject: [PATCH 122/153] yq-go: 4.40.4 -> 4.40.5 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index ada98eb33b47..350211001ad9 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.40.4"; + version = "4.40.5"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - hash = "sha256-cEOOaQAduL9a+EwWigzPDN1ABM6wEjEc8dV4ESFkMXA="; + hash = "sha256-CCgertXgnA6q259Ngmy4EBD6GDuvSb0bREDddR2ht8E="; }; - vendorHash = "sha256-kFDW8HrBhSuflAbuC6Zs/61OLXPsfPQfYU7Laa7eK9c="; + vendorHash = "sha256-SQGJj5syay4LllqmK/cRoZbprgDQhLGdQM3T1m/dZsI="; nativeBuildInputs = [ installShellFiles ]; From 19c4cb1dd735aced526033902c8f5cd49b4c2d97 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:37:06 +0100 Subject: [PATCH 123/153] athens: 0.12.1 -> 0.13.0 --- pkgs/by-name/at/athens/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index 0dfee342a3c2..e511bd98e8bd 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -4,16 +4,16 @@ }: buildGo121Module rec { pname = "athens"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "gomods"; repo = pname; rev = "v${version}"; - hash = "sha256-m75Ut1UVwz7uWneBwPxUL7aPOXIpy6YPqIXMwczHOpY="; + hash = "sha256-27BBPDK5lGwEFsgLf+/lE9CM8g1AbGUgM1iOL7XZqsU="; }; - vendorHash = "sha256-zK4EE242Gbgew33oxAUNxylKdhRdPhqP0Hrpu4sYiFg="; + vendorHash = "sha256-5U9ql0wszhr5H3hAo2utONuEh4mUSiO71XQHkAnMhZU="; CGO_ENABLED = "0"; ldflags = [ "-s" "-w" "-buildid=" "-X github.com/gomods/athens/pkg/build.version=${version}" ]; From e5a305357c398401f64981db221284a91de9b1ac Mon Sep 17 00:00:00 2001 From: Soner Sayakci Date: Mon, 11 Dec 2023 11:52:25 +0100 Subject: [PATCH 124/153] php82Extensions.blackfire: block php zts builds --- pkgs/development/tools/misc/blackfire/php-probe.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 39f5dd5185f4..960928c24552 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -9,6 +9,8 @@ , common-updater-scripts }: +assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions of PHP"; + let phpMajor = lib.versions.majorMinor php.version; From a39043f124bed049574388cbe21bfdea7b22fb4a Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Wed, 29 Nov 2023 16:15:28 +0100 Subject: [PATCH 125/153] Apply markdown lints to CUDA READMEs --- pkgs/development/cuda-modules/README.md | 35 ++++++++++---- .../cuda-modules/modules/README.md | 47 +++++++++++++++---- 2 files changed, 64 insertions(+), 18 deletions(-) diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md index f4844c46a2c2..7b6024bc9ea9 100644 --- a/pkgs/development/cuda-modules/README.md +++ b/pkgs/development/cuda-modules/README.md @@ -1,30 +1,47 @@ -# cuda-modules +# Cuda modules > [!NOTE] -> This document is meant to help CUDA maintainers understand the structure of the CUDA packages in Nixpkgs. It is not meant to be a user-facing document. +> This document is meant to help CUDA maintainers understand the structure of +> the CUDA packages in Nixpkgs. It is not meant to be a user-facing document. > For a user-facing document, see [the CUDA section of the manual](../../../doc/languages-frameworks/cuda.section.md). -The files in this directory are added (in some way) to the `cudaPackages` package set by [cuda-packages.nix](../../top-level/cuda-packages.nix). +The files in this directory are added (in some way) to the `cudaPackages` +package set by [cuda-packages.nix](../../top-level/cuda-packages.nix). ## Top-level files -Top-level nix files are included in the initial creation of the `cudaPackages` scope. These are typically required for the creation of the finalized `cudaPackages` scope: +Top-level nix files are included in the initial creation of the `cudaPackages` +scope. These are typically required for the creation of the finalized +`cudaPackages` scope: - `backend-stdenv.nix`: Standard environment for CUDA packages. - `flags.nix`: Flags set, or consumed by, NVCC in order to build packages. - `gpus.nix`: A list of supported NVIDIA GPUs. -- `nvcc-compatibilities.nix`: NVCC releases and the version range of GCC/Clang they support. +- `nvcc-compatibilities.nix`: NVCC releases and the version range of GCC/Clang + they support. ## Top-level directories - `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope. -- `cudatoolkit`: monolothic CUDA Toolkit run-file installer. Provides extension to `cudaPackages` scope. +- `cudatoolkit`: monolothic CUDA Toolkit run-file installer. Provides extension + to `cudaPackages` scope. - `cudnn`: NVIDIA cuDNN library. - `cutensor`: NVIDIA cuTENSOR library. - `generic-builders`: - - Contains a builder `manifest.nix` which operates on the `Manifest` type defined in `modules/generic/manifests`. Most packages are built using this builder. - - Contains a builder `multiplex.nix` which leverages the Manifest builder. In short, the Multiplex builder adds multiple versions of a single package to single instance of the CUDA Packages package set. It is used primarily for packages like `cudnn` and `cutensor`. -- `modules`: Nixpkgs modules to check the shape and content of CUDA redistributable and feature manifests. These modules additionally use shims provided by some CUDA packages to allow them to re-use the `genericManifestBuilder`, even if they don't have manifest files of their own. `cudnn` and `tensorrt` are examples of packages which provide such shims. These modules are further described in the [Modules](./modules/README.md) documentation. + - Contains a builder `manifest.nix` which operates on the `Manifest` type + defined in `modules/generic/manifests`. Most packages are built using this + builder. + - Contains a builder `multiplex.nix` which leverages the Manifest builder. In + short, the Multiplex builder adds multiple versions of a single package to + single instance of the CUDA Packages package set. It is used primarily for + packages like `cudnn` and `cutensor`. +- `modules`: Nixpkgs modules to check the shape and content of CUDA + redistributable and feature manifests. These modules additionally use shims + provided by some CUDA packages to allow them to re-use the + `genericManifestBuilder`, even if they don't have manifest files of their + own. `cudnn` and `tensorrt` are examples of packages which provide such + shims. These modules are further described in the + [Modules](./modules/README.md) documentation. - `nccl`: NVIDIA NCCL library. - `nccl-tests`: NVIDIA NCCL tests. - `saxpy`: Example CMake project that uses CUDA. diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md index 31aa343bd9d5..7db8435c9dc8 100644 --- a/pkgs/development/cuda-modules/modules/README.md +++ b/pkgs/development/cuda-modules/modules/README.md @@ -1,27 +1,56 @@ # Modules -Modules as they are used in `modules` exist primarily to check the shape and content of CUDA redistributable and feature manifests. They are ultimately meant to reduce the repetitive nature of repackaging CUDA redistributables. +Modules as they are used in `modules` exist primarily to check the shape and +content of CUDA redistributable and feature manifests. They are ultimately meant +to reduce the repetitive nature of repackaging CUDA redistributables. -Building most redistributables follows a pattern of a manifest indicating which packages are available at a location, their versions, and their hashes. To avoid creating builders for each and every derivation, modules serve as a way for us to use a single `genericManifestBuilder` to build all redistributables. +Building most redistributables follows a pattern of a manifest indicating which +packages are available at a location, their versions, and their hashes. To avoid +creating builders for each and every derivation, modules serve as a way for us +to use a single `genericManifestBuilder` to build all redistributables. ## `generic` -The modules in `generic` are reusable components meant to check the shape and content of NVIDIA's CUDA redistributable manifests, our feature manifests (which are derived from NVIDIA's manifests), or hand-crafted Nix expressions describing available packages. They are used by the `genericManifestBuilder` to build CUDA redistributables. +The modules in `generic` are reusable components meant to check the shape and +content of NVIDIA's CUDA redistributable manifests, our feature manifests (which +are derived from NVIDIA's manifests), or hand-crafted Nix expressions describing +available packages. They are used by the `genericManifestBuilder` to build CUDA +redistributables. -Generally, each package which relies on manifests or Nix release expressions will create an alias to the relevant generic module. For example, the [module for CUDNN](./cudnn/default.nix) aliases the generic module for release expressions, while the [module for CUDA redistributables](./cuda/default.nix) aliases the generic module for manifests. +Generally, each package which relies on manifests or Nix release expressions +will create an alias to the relevant generic module. For example, the [module +for CUDNN](./cudnn/default.nix) aliases the generic module for release +expressions, while the [module for CUDA redistributables](./cuda/default.nix) +aliases the generic module for manifests. -Alternatively, additional fields or values may need to be configured to account for the particulars of a package. For example, while the release expressions for [CUDNN](./cudnn/releases.nix) and [TensorRT](./tensorrt/releases.nix) are very close, they differ slightly in the fields they have. The [module for CUDNN](./modules/cudnn/default.nix) is able to use the generic module for release expressions, while the [module for TensorRT](./modules/tensorrt/default.nix) must add additional fields to the generic module. +Alternatively, additional fields or values may need to be configured to account +for the particulars of a package. For example, while the release expressions for +[CUDNN](./cudnn/releases.nix) and [TensorRT](./tensorrt/releases.nix) are very +close, they differ slightly in the fields they have. The [module for +CUDNN](./modules/cudnn/default.nix) is able to use the generic module for +release expressions, while the [module for +TensorRT](./modules/tensorrt/default.nix) must add additional fields to the +generic module. ### `manifests` -The modules in `generic/manifests` define the structure of NVIDIA's CUDA redistributable manifests and our feature manifests. +The modules in `generic/manifests` define the structure of NVIDIA's CUDA +redistributable manifests and our feature manifests. -NVIDIA's redistributable manifests are retrieved from their web server, while the feature manifests are produced by [`cuda-redist-find-features`](https://github.com/connorbaker/cuda-redist-find-features). +NVIDIA's redistributable manifests are retrieved from their web server, while +the feature manifests are produced by +[`cuda-redist-find-features`](https://github.com/connorbaker/cuda-redist-find-features). ### `releases` -The modules in `generic/releases` define the structure of our hand-crafted Nix expressions containing information necessary to download and repackage CUDA redistributables. These expressions are created when NVIDIA-provided manifests are unavailable or otherwise unusable. For example, though CUDNN has manifests, a bug in NVIDIA's CI/CD causes manifests for different versions of CUDA to use the same name, which leads to the manifests overwriting each other. +The modules in `generic/releases` define the structure of our hand-crafted Nix +expressions containing information necessary to download and repackage CUDA +redistributables. These expressions are created when NVIDIA-provided manifests +are unavailable or otherwise unusable. For example, though CUDNN has manifests, +a bug in NVIDIA's CI/CD causes manifests for different versions of CUDA to use +the same name, which leads to the manifests overwriting each other. ### `types` -The modules in `generic/types` define reusable types used in both `generic/manifests` and `generic/releases`. +The modules in `generic/types` define reusable types used in both +`generic/manifests` and `generic/releases`. From d92daec27ee4662c8a4a10206d9bfc3d7e557f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Tue, 12 Dec 2023 10:48:10 +0100 Subject: [PATCH 126/153] ratman: migrate to prefetch-yarn-deps (#269285) --- pkgs/tools/networking/ratman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ratman/default.nix b/pkgs/tools/networking/ratman/default.nix index ce017731bd4a..a78840095d88 100644 --- a/pkgs/tools/networking/ratman/default.nix +++ b/pkgs/tools/networking/ratman/default.nix @@ -6,7 +6,7 @@ , protobuf , rustPlatform , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , stdenv , yarn , nodejs @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; - nativeBuildInputs = [ yarn nodejs ]; + nativeBuildInputs = [ yarn nodejs prefetch-yarn-deps ]; outputs = [ "out" "dist" ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { yarn config --offline set yarn-offline-mirror ${yarnDeps} # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive From 11a5040a483ef9e5db62ba5b13985aa79d2ad48e Mon Sep 17 00:00:00 2001 From: Vanilla Date: Tue, 12 Dec 2023 17:58:03 +0800 Subject: [PATCH 127/153] lshw: fix static build --- pkgs/tools/system/lshw/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 9878f82b9d09..5a6318ea4c21 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; + hardeningDisable = lib.optionals stdenv.hostPlatform.isStatic [ "fortify" ]; + installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; enableParallelBuilding = true; From a3ac436cfb2d494729ad40d75e4762dc3c4de83b Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Tue, 12 Dec 2023 11:24:53 +0100 Subject: [PATCH 128/153] Add ignore dependency for cuda_compat After testing on a Jetson device, it turns out `cuda_compat` requires libnvdla_runtime.so which can't be satisfied by autoPatchElf, as it is provided by the runtime driver. This commit simply adds this library to the list of dependency to be ignored by autoPatchElf. --- pkgs/development/cuda-modules/cuda/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 061d5da16bb5..fd32978bfb59 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -45,7 +45,7 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { cuda_compat = prev.cuda_compat.overrideAttrs ( prevAttrs: { env.autoPatchelfIgnoreMissingDeps = - prevAttrs.env.autoPatchelfIgnoreMissingDeps + " libnvrm_gpu.so libnvrm_mem.so"; + prevAttrs.env.autoPatchelfIgnoreMissingDeps + " libnvrm_gpu.so libnvrm_mem.so libnvdla_runtime.so"; # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices. brokenConditions = prevAttrs.brokenConditions // { "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" = From 6fe8ff23d27566b92c14766b739c5ad4367176cd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 12 Dec 2023 08:30:12 +0100 Subject: [PATCH 129/153] pylyzer: 0.0.50 -> 0.0.51 Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.50...v0.0.51 Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.51 --- pkgs/development/tools/language-servers/pylyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index b00ab1ccf0cf..3f48b0b9d824 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.50"; + version = "0.0.51"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-w6CXKBbELkPNido0bldMDqoLZbqLd0gKBv576uLAX3Y="; + hash = "sha256-TKAmIy5dP2m1iokxSqfxTj79UDkW00+se/NDGS3euwA="; }; - cargoHash = "sha256-/s6ZXvgFXED17CwdmR8lLZDQ3otV334U4Uly90MPV1Y="; + cargoHash = "sha256-035ueF42g6By+6TOGEultc8n350g3mRT00raQgWIcUM="; nativeBuildInputs = [ git From c979d0efb4babbb00f8c52a27298804adc28355a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 6 Dec 2023 11:20:18 +0100 Subject: [PATCH 130/153] plasma5Packages.polonium: init at 0.6.0 --- .../plasma-5/3rdparty/addons/polonium.nix | 51 +++++++++++++++++++ pkgs/desktops/plasma-5/default.nix | 5 +- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix new file mode 100644 index 000000000000..7bfe963e0e8b --- /dev/null +++ b/pkgs/desktops/plasma-5/3rdparty/addons/polonium.nix @@ -0,0 +1,51 @@ +{ lib +, fetchFromGitHub +, buildNpmPackage +, plasma-framework +}: + +# how to update: +# 1. check out the tag for the version in question +# 2. run `prefetch-npm-deps package-lock.json` +# 3. update npmDepsHash with the output of the previous step + +buildNpmPackage rec { + pname = "polonium"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "zeroxoneafour"; + repo = pname; + rev = "v" + version; + hash = "sha256-fZgNOcOq+owmqtplwnxeOIQpWmrga/WitCNCj89O5XA="; + }; + + npmDepsHash = "sha256-25AtM1FweWIbFot+HUMSPYTu47/0eKNpRWSlBEL0yKk="; + + dontConfigure = true; + + # the installer does a bunch of stuff that fails in our sandbox, so just build here and then we + # manually do the install + buildFlags = [ "res" "src" ]; + + nativeBuildInputs = [ plasma-framework ]; + + dontNpmBuild = true; + + dontWrapQtApps = true; + + installPhase = '' + runHook preInstall + + plasmapkg2 --install pkg --packageroot $out/share/kwin/scripts + + runHook postInstall + ''; + + meta = with lib; { + description = "Auto-tiler that uses KWin 5.27+ tiling functionality"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + inherit (plasma-framework.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 0c501b4c5a4c..781bf1606709 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -49,7 +49,7 @@ let mirror = "mirror://kde"; }; - qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {}; + qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) { }; packages = self: let @@ -96,7 +96,7 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ libsForQt5.wrapQtAppsHook ]; meta = let meta = args.meta or { }; in @@ -183,6 +183,7 @@ let kzones = callPackage ./3rdparty/kwin/scripts/kzones.nix { }; lightly = callPackage ./3rdparty/lightly { }; parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; + polonium = callPackage ./3rdparty/addons/polonium.nix { }; }; } // lib.optionalAttrs config.allowAliases { From b8927e2047689d7636c32a5a6f0f46b7b316d349 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 10 Dec 2023 22:24:31 +0100 Subject: [PATCH 131/153] ungoogled-chromium: add `ungoogled-` prefix to `chromium-unwrapped` --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a322a171051f..a2ce5265959e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -176,7 +176,7 @@ let base = rec { - pname = "${packageName}-unwrapped"; + pname = "${lib.optionalString ungoogled "ungoogled-"}${packageName}-unwrapped"; inherit (upstream-info) version; inherit packageName buildType buildPath; From 0eb389be6e718b4d668d433a3fe4dea1fa4099de Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 10 Dec 2023 22:24:39 +0100 Subject: [PATCH 132/153] chromium: move stray patches into `./patches` directory --- pkgs/applications/networking/browsers/chromium/common.nix | 4 ++-- .../chromium/{ => patches}/chromium-120-llvm-16.patch | 0 .../browsers/chromium/{ => patches}/cross-compile.patch | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/applications/networking/browsers/chromium/{ => patches}/chromium-120-llvm-16.patch (100%) rename pkgs/applications/networking/browsers/chromium/{ => patches}/cross-compile.patch (100%) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index a2ce5265959e..386957bed0c2 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -237,7 +237,7 @@ let ++ lib.optional pulseSupport libpulseaudio; patches = [ - ./cross-compile.patch + ./patches/cross-compile.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed): ./patches/no-build-timestamps.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags: @@ -256,7 +256,7 @@ let }) ] ++ lib.optionals (chromiumVersionAtLeast "120") [ # We need to revert this patch to build M120+ with LLVM 16: - ./chromium-120-llvm-16.patch + ./patches/chromium-120-llvm-16.patch ] ++ lib.optionals (!chromiumVersionAtLeast "119.0.6024.0") [ # Fix build with at-spi2-core ≥ 2.49 # This version is still needed for electron. diff --git a/pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/chromium-120-llvm-16.patch rename to pkgs/applications/networking/browsers/chromium/patches/chromium-120-llvm-16.patch diff --git a/pkgs/applications/networking/browsers/chromium/cross-compile.patch b/pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch similarity index 100% rename from pkgs/applications/networking/browsers/chromium/cross-compile.patch rename to pkgs/applications/networking/browsers/chromium/patches/cross-compile.patch From 0ed60bbcd1b043431958f004c29cb0f01ebd9004 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 10 Dec 2023 22:24:41 +0100 Subject: [PATCH 133/153] chromium: fix increased build time for non-cross-compilation builds Having ```nix host_toolchain = "//build/toolchain/linux/unbundle:host"; v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; ``` on native, non-cross-compilation builds roughly doubles the build steps and, by proxy, compute and time needed to build. So to resolve this, we conditionally change those values depending on whether we are cross-compiling or not. Co-authored-by: Adam Joseph --- pkgs/applications/networking/browsers/chromium/common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 386957bed0c2..50d11ff39d84 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -387,9 +387,13 @@ let # depending on which part of the codebase you are in; see: # https://github.com/chromium/chromium/blob/d36462cc9279464395aea5e65d0893d76444a296/build/config/BUILDCONFIG.gn#L17-L44 custom_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:default"; + # We only build those specific toolchains when we cross-compile, as native non-cross-compilations would otherwise + # end up building much more things than they need to (roughtly double the build steps and time/compute): + } // lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) { host_toolchain = "//build/toolchain/linux/unbundle:host"; v8_snapshot_toolchain = "//build/toolchain/linux/unbundle:host"; - + } // { host_pkg_config = "${pkgsBuildBuild.pkg-config}/bin/pkg-config"; pkg_config = "${pkgsBuildHost.pkg-config}/bin/${stdenv.cc.targetPrefix}pkg-config"; From 0cdbeb740940453520856bb4e991e9337c01e4c0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Dec 2023 08:56:13 -0500 Subject: [PATCH 134/153] sing-box: 1.7.4 -> 1.7.5 Diff: https://github.com/SagerNet/sing-box/compare/v1.7.4...v1.7.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index a158f221894a..cc826474d3eb 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-I1c6zc/vnAoE97wESy3ZGITto4d5dfjpGNbw4vTeElc="; + hash = "sha256-6SWcepENdbkwv4qq4nuxSINAxXWZmLcj5NwJ3nBnKu8="; }; - vendorHash = "sha256-wK5gwj7UnQCHtRLim3S81n0T2N8jMP74K4TWxJYVuRA="; + vendorHash = "sha256-8R3bVwziiC9n10dA8Zus7L0VyjWYKkdSszb44HqR8tE="; tags = [ "with_quic" From d6c198a5d95f39fbd54042f1b7b874461c8e8951 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Fri, 17 Nov 2023 16:51:48 +0100 Subject: [PATCH 135/153] Enable cuda_compat by default on Jetson devices Some nvidia devices, such as the Jetson family, support the Nvidia compatibility package (nvidia_compat) which allows to run executables built against a higher CUDA major version on a system with an older CUDA driver. On such platforms, the consensus among CUDA maintainers is that there is no downside in always enabling it by default. This commit links to the relevant cuda_compat shared libraries by patching the CUDA core packages' runpaths when cuda_compat is available, in the same way as we do for OpenGL drivers currently. --- .../generic-builders/manifest.nix | 9 +++++++ .../auto-add-cuda-compat-runpath.sh | 27 +++++++++++++++++++ .../cuda-modules/setup-hooks/extension.nix | 20 ++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix index 7ddecb7ed723..c7ff0f53bb74 100644 --- a/pkgs/development/cuda-modules/generic-builders/manifest.nix +++ b/pkgs/development/cuda-modules/generic-builders/manifest.nix @@ -1,6 +1,7 @@ { # General callPackage-supplied arguments autoAddOpenGLRunpathHook, + autoAddCudaCompatRunpathHook, autoPatchelfHook, backendStdenv, fetchurl, @@ -126,6 +127,14 @@ backendStdenv.mkDerivation ( # Check e.g. with `patchelf --print-rpath path/to/my/binary autoAddOpenGLRunpathHook markForCudatoolkitRootHook + ] + # autoAddCudaCompatRunpathHook depends on cuda_compat and would cause + # infinite recursion if applied to `cuda_compat` itself (beside the fact + # that it doesn't make sense in the first place) + ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [ + # autoAddCudaCompatRunpathHook must appear AFTER autoAddOpenGLRunpathHook. + # See its documentation in ./setup-hooks/extension.nix. + autoAddCudaCompatRunpathHook ]; buildInputs = diff --git a/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh new file mode 100644 index 000000000000..537daad2f00e --- /dev/null +++ b/pkgs/development/cuda-modules/setup-hooks/auto-add-cuda-compat-runpath.sh @@ -0,0 +1,27 @@ +# shellcheck shell=bash +# Patch all dynamically linked, ELF files with the CUDA driver (libcuda.so) +# coming from the cuda_compat package by adding it to the RUNPATH. +echo "Sourcing auto-add-cuda-compat-runpath-hook" + +elfHasDynamicSection() { + patchelf --print-rpath "$1" >& /dev/null +} + +autoAddCudaCompatRunpathPhase() ( + local outputPaths + mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done) + find "${outputPaths[@]}" -type f -executable -print0 | while IFS= read -rd "" f; do + if isELF "$f"; then + # patchelf returns an error on statically linked ELF files + if elfHasDynamicSection "$f" ; then + echo "autoAddCudaCompatRunpathHook: patching $f" + local origRpath="$(patchelf --print-rpath "$f")" + patchelf --set-rpath "@libcudaPath@:$origRpath" "$f" + elif (( "${NIX_DEBUG:-0}" >= 1 )) ; then + echo "autoAddCudaCompatRunpathHook: skipping a statically-linked ELF file $f" + fi + fi + done +) + +postFixupHooks+=(autoAddCudaCompatRunpathPhase) diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 762dad9ea876..964c383a735d 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -44,4 +44,24 @@ final: _: { ./auto-add-opengl-runpath-hook.sh ) {}; + + # autoAddCudaCompatRunpathHook hook must be added AFTER `setupCudaHook`. Both + # hooks prepend a path with `libcuda.so` to the `DT_RUNPATH` section of + # patched elf files, but `cuda_compat` path must take precedence (otherwise, + # it doesn't have any effect) and thus appear first. Meaning this hook must be + # executed last. + autoAddCudaCompatRunpathHook = + final.callPackage + ( + {makeSetupHook, cuda_compat}: + makeSetupHook + { + name = "auto-add-cuda-compat-runpath-hook"; + substitutions = { + libcudaPath = "${cuda_compat}/compat"; + }; + } + ./auto-add-cuda-compat-runpath.sh + ) + {}; } From 26dd975482dc86a0fe115c999edc82427c0d43d2 Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Wed, 29 Nov 2023 19:29:50 +0100 Subject: [PATCH 136/153] Add basic documentation on cuda_compat --- pkgs/development/cuda-modules/README.md | 48 +++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md index 7b6024bc9ea9..76732c5ddfb3 100644 --- a/pkgs/development/cuda-modules/README.md +++ b/pkgs/development/cuda-modules/README.md @@ -47,3 +47,51 @@ scope. These are typically required for the creation of the finalized - `saxpy`: Example CMake project that uses CUDA. - `setup-hooks`: Nixpkgs setup hooks for CUDA. - `tensorrt`: NVIDIA TensorRT library. + +## Distinguished packages + +### Cuda compatibility + +[Cuda Compatibility](https://docs.nvidia.com/deploy/cuda-compatibility/), +available as `cudaPackages.cuda_compat`, is a component which makes it possible +to run applications built against a newer CUDA toolkit (for example CUDA 12) on +a machine with an older CUDA driver (for example CUDA 11), which isn't possible +out of the box. At the time of writing, Cuda Compatibility is only available on +the Nvidia Jetson architecture, but Nvidia might release support for more +architectures in the future. + +As Cuda Compatibility strictly increases the range of supported applications, we +try our best to enable it by default on supported platforms. + +#### Functioning + +`cuda_compat` simply provides a new `libcuda.so` (and associated variants) that +needs to be used in place of the default CUDA driver's `libcuda.so`. However, +the other shared libraries of the default driver must still be accessible: +`cuda_compat` isn't a complete drop-in replacement for the driver (and that's +the point, otherwise, it would just be a newer driver). + +Nvidia's recommendation is to set `LD_LIBRARY_PATH` to points to `cuda_compat`'s +driver. This is fine for a manual, one-shot usage, but in general setting +`LD_LIBRARY_PATH` is a red flag. This is global state which short-circuits most +of other dynamic libraries resolution mechanisms and can break things in +non-obvious ways, especially with other Nix-built software. + +#### Cuda compat with Nix + +Since `cuda_compat` is a known derivation, the easy way to do this in Nix would +be to add `cuda_compat` as a dependency of CUDA libraries and applications and +let Nix does its magic by filling the `DT_RUNPATH` fields. However, +`cuda_compat` itself depends on `libnvrm_mem` and `libnvrm_gpu` which are loaded +dynamically at runtime from `/run/opengl-driver`. This doesn't please the Nix +sandbox when building, which can't find those (a second minor issue is that +`addOpenGLRunpathHook` prepends the `/run/opengl-driver` path, so that would +still take precedence). + +The current solution is to do something similar to `addOpenGLRunpathHook`: the +`addCudaCompatRunpathHook` prepends to the path to `cuda_compat`'s `libcuda.so` +to the `DT_RUNPATH` of whichever package includes the hook as a dependency, and +we include the hook by default for packages in `cudaPackages` (by adding it as a +inputs in `genericManifestBuilder`). We also make sure it's included after +`addOpenGLRunpathHook`, so that it appears _before_ in the `DT_RUNPATH` and +takes precedence. From b21e84ea8d1db73e3cc7e9f0ec999ed79257e62e Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 27 Oct 2023 17:28:37 +0800 Subject: [PATCH 137/153] nixos/iproute2: use rt_tables.d to avoid IFD --- nixos/modules/config/iproute2.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix index 78bd07d680e2..0cde57b759be 100644 --- a/nixos/modules/config/iproute2.nix +++ b/nixos/modules/config/iproute2.nix @@ -18,10 +18,9 @@ in }; config = mkIf cfg.enable { - environment.etc."iproute2/rt_tables" = { + environment.etc."iproute2/rt_tables.d/nixos.conf" = { mode = "0644"; - text = (fileContents "${pkgs.iproute2}/lib/iproute2/rt_tables") - + (optionalString (cfg.rttablesExtraConfig != "") "\n\n${cfg.rttablesExtraConfig}"); + text = cfg.rttablesExtraConfig; }; }; } From fa2d2bbe6d6a61d01412e3c15acacde772522846 Mon Sep 17 00:00:00 2001 From: Lin Yinfeng Date: Fri, 27 Oct 2023 19:44:57 +0800 Subject: [PATCH 138/153] nixos/iproute2: add release note for the backward compatibility caused by stateless configuration --- nixos/doc/manual/release-notes/rl-2405.section.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 8f9258bd2f08..2e9cd781ffb1 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -35,6 +35,12 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.avahi.nssmdns` got split into `services.avahi.nssmdns4` and `services.avahi.nssmdns6` which enable the mDNS NSS switch for IPv4 and IPv6 respectively. Since most mDNS responders only register IPv4 addresses, most users want to keep the IPv6 support disabled to avoid long timeouts. +- `networking.iproute2.enable` now does not set `environment.etc."iproute2/rt_tables".text`. + + Setting `environment.etc."iproute2/{CONFIG_FILE_NAME}".text` will override the whole configuration file instead of appending it to the upstream configuration file. + + `CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`. + ## Other Notable Changes {#sec-release-24.05-notable-changes} From 6256391a3571679d876ddd58652bdfdc2f5b3ad6 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 12 Dec 2023 16:15:53 +0000 Subject: [PATCH 139/153] cudaPackages.autoAddCudaCompatRunpathHook: broken on non-jetsons ...to prevent the evaluation of cuda_compat --- pkgs/development/cuda-modules/setup-hooks/extension.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 964c383a735d..3ca69a38233a 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -60,6 +60,7 @@ final: _: { substitutions = { libcudaPath = "${cuda_compat}/compat"; }; + meta.broken = !final.flags.isJetsonBuild; } ./auto-add-cuda-compat-runpath.sh ) From 076fc3ad3158bdf0b04374570dfaa30fd0aaf9a9 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 12 Dec 2023 16:20:57 +0000 Subject: [PATCH 140/153] cudaPackages.autoAddCudaCompatRunpathHook: dummy libcudaPath when broken --- pkgs/development/cuda-modules/setup-hooks/extension.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/setup-hooks/extension.nix b/pkgs/development/cuda-modules/setup-hooks/extension.nix index 3ca69a38233a..930730ce6c06 100644 --- a/pkgs/development/cuda-modules/setup-hooks/extension.nix +++ b/pkgs/development/cuda-modules/setup-hooks/extension.nix @@ -58,7 +58,8 @@ final: _: { { name = "auto-add-cuda-compat-runpath-hook"; substitutions = { - libcudaPath = "${cuda_compat}/compat"; + # Hotfix Ofborg evaluation + libcudaPath = if final.flags.isJetsonBuild then "${cuda_compat}/compat" else null; }; meta.broken = !final.flags.isJetsonBuild; } From ea93ca9c3a05f2f0d44aacce136a56762d9f0053 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Dec 2023 11:50:07 -0500 Subject: [PATCH 141/153] opentofu: 1.6.0-beta3 -> 1.6.0-beta4 Diff: https://github.com/opentofu/opentofu/compare/v1.6.0-beta3...v1.6.0-beta4 Changelog: https://github.com/opentofu/opentofu/blob/v1.6.0-beta4/CHANGELOG.md --- pkgs/applications/networking/cluster/opentofu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index ad63958d7695..068a34d29d4b 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,13 +14,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-beta3"; + version = "1.6.0-beta4"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-71QJ6rhzFAE78v6RxO1nSroyjF0vrlKC3UIp9ksZolk="; + hash = "sha256-AFy7xg1UwVWlFZjelYhxfkhj4Tk93uVvF1i3PHa2jEM="; }; vendorHash = "sha256-kSm5RZqQRgbmPaKt5IWmuMhHwAu+oJKTX1q1lbE7hWk="; From 002861bb572de737edab426a456163268afe1e7e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 12 Dec 2023 17:46:46 +0100 Subject: [PATCH 142/153] release-python.nix: remove dreamed-up config option For some reason I had the impression this option existed, but it doesn't. Sadly `nixpkgs.config` is a freeform type attrset, that wouldn't even bark at me, so I didn't notice this will testing. --- pkgs/top-level/release-python.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index d1baf51745c7..ec5255362bcc 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -11,7 +11,6 @@ , # Attributes passed to nixpkgs. Don't build packages marked as unfree. nixpkgsArgs ? { config = { allowUnfree = false; - allowInsecure = false; inHydra = true; permittedInsecurePackages = [ # Keep evaluating home-assistant, which is transitively affected From 5c640240561a332b97eb20121d098fb0146efe18 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 12 Dec 2023 10:49:42 -0700 Subject: [PATCH 143/153] matrix-synapse: 1.97.0 -> 1.98.0 https://github.com/matrix-org/synapse/releases/tag/v1.98.0 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 56f9b6c7af8f..a51ea5a9269c 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.97.0"; + version = "1.98.0"; format = "pyproject"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-KusCJj5MVmRbniI9aTjRInPMpIDZKWs5w+TImVKHrPc="; + hash = "sha256-irPExb8rwQjkPp0b3x5hJG4Ay6OnITWIGRPxBSoP/Dk="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-SImgV47EfKy70VmcBREu1aiZFvX0+h0Ezw+/rUZufAg="; + hash = "sha256-DHKhEFXquWfHfk54mTehjchg3KsB4CfzElXMt5Mp+Vg="; }; postPatch = '' From eb2f1aa391fd59f8013a83ad552bcc136f19630d Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Tue, 12 Dec 2023 13:02:03 -0500 Subject: [PATCH 144/153] remmina: Add `meta.mainProgram` Add a `meta.mainProgram` attribute for use with `lib.getExe`. --- pkgs/applications/networking/remote/remmina/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5aedd89cb68d..0fd2de49dac3 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -83,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; + mainProgram = "remmina"; maintainers = with maintainers; [ bbigras melsigl ryantm ]; platforms = platforms.linux ++ platforms.darwin; }; From 52af4c8c0f41daf6701eed2472bf377755920b7b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:32:47 +0100 Subject: [PATCH 145/153] gnome-extension-manager: unbreak on aarch64-linux --- pkgs/applications/misc/gnome-extension-manager/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/misc/gnome-extension-manager/default.nix b/pkgs/applications/misc/gnome-extension-manager/default.nix index 1dfa17981e89..5a0a1c3cf682 100644 --- a/pkgs/applications/misc/gnome-extension-manager/default.nix +++ b/pkgs/applications/misc/gnome-extension-manager/default.nix @@ -60,7 +60,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ foo-dogsquared ]; - # never built on aarch64-linux since first introduction in nixpkgs - broken = stdenv.isLinux && stdenv.isAarch64; }; } From e8d403b6974c41201a82cb8e2ea84095088c2f19 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 12 Dec 2023 21:48:59 +0100 Subject: [PATCH 146/153] htmlq: set meta.mainProgram --- pkgs/development/tools/htmlq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/htmlq/default.nix b/pkgs/development/tools/htmlq/default.nix index 1adcaf954d04..6a5015c600fc 100644 --- a/pkgs/development/tools/htmlq/default.nix +++ b/pkgs/development/tools/htmlq/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/mgdm/htmlq"; license = licenses.mit; maintainers = with maintainers; [ siraben nerdypepper ]; + mainProgram = "htmlq"; }; } From 1f06e081c92baffb0e159819fee1f1d6db3352da Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 12 Dec 2023 21:49:17 +0100 Subject: [PATCH 147/153] restic: set meta.mainProgram --- pkgs/tools/backup/restic/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index a3223c04e297..72220f17d26e 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm maintainers.dotlambda ]; + mainProgram = "restic"; }; } From ea9e108a0bafe81df7e0461f7286400e1db6c694 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Dec 2023 16:04:19 -0500 Subject: [PATCH 148/153] lhapdf: 6.5.3 -> 6.5.4 (#273276) --- .../libraries/physics/lhapdf/default.nix | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index 00f548806fc5..0482846f077a 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -1,30 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, makeWrapper }: +{ lib, stdenv, fetchurl, python, makeWrapper }: stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.5.3"; + version = "6.5.4"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-V0Nc1pXilwZdU+ab0pCQdlyTSTa2qXX/jFWXZvIjA1k="; + sha256 = "sha256-JEOksyzDsFl8gki9biVwOs6ckaeiU8X2CxtUKO+chp4="; }; - patches = [ - # avoid silent compilation failures - (fetchpatch { - name = "lhapdf-propagate_returncode.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/2806ac795c7e4a69281d9c2a6a8bba5423f37e74.diff"; - hash = "sha256-j8txlt0n5gpUy9zeuWKx+KRXL3HMMaGcwOxr908966k="; - }) - - # workaround "ld: -stack_size option can only be used when linking a main executable" on darwin - (fetchpatch { - name = "lhapdf-Wl_stack_size.patch"; - url = "https://gitlab.com/hepcedar/lhapdf/-/commit/463764d6613837b6ab57ecaf13bc61be2349e5e4.diff"; - hash = "sha256-AbDs7gtU5HsJG5n/solMzu2bjX1juxfUIqIt5KmNffU="; - }) - ]; - # The Apple SDK only exports locale_t from xlocale.h whereas glibc # had decided that xlocale.h should be a part of locale.h postPatch = lib.optionalString (stdenv.isDarwin && stdenv.cc.isGNU) '' From 1a5412e14030d2a00281021d5f8ef05b31027912 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 12 Dec 2023 16:04:33 -0500 Subject: [PATCH 149/153] toil: 5.7.1 -> 5.12.0 (#273274) --- pkgs/applications/science/misc/toil/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 7fc070f4f9f7..9142676fff48 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -6,21 +6,16 @@ python3.pkgs.buildPythonApplication rec { pname = "toil"; - version = "5.7.1"; + version = "5.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "DataBiosphere"; repo = pname; rev = "refs/tags/releases/${version}"; - hash = "sha256-m+XvNyzd0ly2YqKhgxezgGaCXLs3CmupJMnp5RIZqNI="; + hash = "sha256-cTpbQo9tPZifUO59vbnIa3XUinFJ2/5Slfe4yszglFM="; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "docker>=3.7.2, <6" "docker" - ''; - propagatedBuildInputs = with python3.pkgs; [ addict dill @@ -42,7 +37,6 @@ python3.pkgs.buildPythonApplication rec { boto botocore flask - mypy-boto3-s3 pytestCheckHook stubserver ]); @@ -63,6 +57,10 @@ python3.pkgs.buildPythonApplication rec { "src/toil/test/src" "src/toil/test/wdl" "src/toil/test/utils/utilsTest.py" + "src/toil/test/cwl/cwlTest.py" + "src/toil/test/lib/test_ec2.py" + "src/toil/test/lib/aws/test_iam.py" + "src/toil/test/lib/aws/test_s3.py" ]; disabledTests = [ From 3be758860c96b3c0e94f97fdb72f0387ca033736 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Tue, 12 Dec 2023 20:23:28 +0100 Subject: [PATCH 150/153] nushell: 0.87.1 -> 0.88.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index bace4b422edf..4a7da71db2a7 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.87.1"; + version = "0.88.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-lPfP0bnMTb+IQoWdf7oHaj96/l68Ic6OmB/Ur9Q65g8="; + hash = "sha256-kqN/R5SD+vMJV039/YZvO9OIfjqIRGTZVcTrqBkl+9E="; }; - cargoHash = "sha256-2xc0IiPCmhFtVXWEpDpRny27/bJZAh/Ke9+LVsrcWF0="; + cargoHash = "sha256-Mdm5E3TUlMIDpL4VaZf/5OZQ6UVU70qicbdAS8seWSI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] From 62480480791b21ac4fe37f4c467c204bca27eb62 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:47:46 +0100 Subject: [PATCH 151/153] nushellPlugins: update to nushell 0.88.0 --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 279edd1f6bca..3a9ebe9002fc 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-rryKNRCf8i/jlqN5O6+UDvV5tDNxcVxS+KewCaIlZVM="; + cargoHash = "sha256-K1ZKz0635yWE16mPtJwlfwt2QrqnwsbDm1ot5nTr0RI="; nativeBuildInputs = [ pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit Foundation ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 5e3a8186245f..e72f3b19f8a2 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-9wUOKj6kMfXEFdYvVBqxme4MRkR6HORx+spTVT9t9VM="; + cargoHash = "sha256-veQfK1eeVi15TCEiTZaaNAxUXc0LgjLgfP3WJ6rWtWQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 0994182305c4..71679cf069ff 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-HCGq0tvSNvWlZBD0Kn9H9qKFW+VgGON3z2ly3qaURSE="; + cargoHash = "sha256-oS6FtCNWi5eL+uTlH5DiFrXvtwrE9GyXNL15cSFbBcU="; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; cargoBuildFlags = [ "--package nu_plugin_query" ]; From 6b83dc8ff8e9c23039f045567038e13e19699211 Mon Sep 17 00:00:00 2001 From: Cynthia Fox Date: Tue, 12 Dec 2023 12:45:37 -0500 Subject: [PATCH 152/153] neovim-qt: Add `meta.mainProgram` Add a `meta.mainProgram` attribute to allow use of `lib.getExe` properly with this program. --- pkgs/applications/editors/neovim/neovim-qt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/neovim-qt.nix b/pkgs/applications/editors/neovim/neovim-qt.nix index a8483f0db348..75067585653b 100644 --- a/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/pkgs/applications/editors/neovim/neovim-qt.nix @@ -37,6 +37,7 @@ mkDerivation rec { description = "Neovim client library and GUI, in Qt5"; homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; + mainProgram = "nvim-qt"; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; }; From 4eb501c977591c17db6697e5c8fed4c8520809ed Mon Sep 17 00:00:00 2001 From: ahirner Date: Mon, 11 Dec 2023 22:16:41 +0100 Subject: [PATCH 153/153] vector: add SystemConfiguration for darwin, fixes ld --- pkgs/tools/misc/vector/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index ddd6e32e16d4..14048bc4845c 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -13,6 +13,7 @@ , libiconv , coreutils , CoreServices +, SystemConfiguration , tzdata , cmake , perl @@ -62,8 +63,9 @@ rustPlatform.buildRustPackage { }; }; nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; - buildInputs = [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + buildInputs = + [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ab5d6b1af40..37abeeeddcfa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40429,7 +40429,7 @@ with pkgs; }; vector = callPackage ../tools/misc/vector { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; + inherit (darwin.apple_sdk.frameworks) Security CoreServices SystemConfiguration; }; hjson = with python3Packages; toPythonApplication hjson;