From b6df7be47c992d301ca8b2ea0a0a03eae98abd6a Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 24 May 2025 23:58:58 +0200 Subject: [PATCH 001/103] linuxPackages.shufflecake: 0.5.1 -> 0.5.2 --- pkgs/os-specific/linux/shufflecake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index acc7ab0b340a..6a62f901f677 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { name = "shufflecake"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "shufflecake"; repo = "shufflecake-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-ULRx+WEz7uQ1C0JDaXORo6lmiwBAwD20j/XP92YE/K0="; + hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 3a9486b017ce85c5e2f12a3c60b62baac685d709 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 24 May 2025 23:59:11 +0200 Subject: [PATCH 002/103] linuxPackages.shufflecake: fix build with gcc 14 --- pkgs/os-specific/linux/shufflecake/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix index 6a62f901f677..6871364183b5 100644 --- a/pkgs/os-specific/linux/shufflecake/default.nix +++ b/pkgs/os-specific/linux/shufflecake/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: { "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; + # GCC 14 makes this an error by default, remove when fixed upstream + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + outputs = [ "out" "bin" From c5cea38e690922026a14bec43c21370ec67503f3 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 25 May 2025 00:33:28 +0200 Subject: [PATCH 003/103] linuxPackages.veikk-linux-driver: fix build with kernels >= 6.12 --- .../linux/veikk-linux-driver/default.nix | 2 ++ .../veikk-linux-driver/fix-6.12-build.patch | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index 55ce63db7902..81111d4e710e 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn"; }; + patches = [ ./fix-6.12-build.patch ]; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel ]; diff --git a/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch b/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch new file mode 100644 index 000000000000..feae73dd83e2 --- /dev/null +++ b/pkgs/os-specific/linux/veikk-linux-driver/fix-6.12-build.patch @@ -0,0 +1,26 @@ +https://github.com/torvalds/linux/commit/5f60d5f6bbc12e782fac78110b0ee62698f3b576 +--- + veikk_vdev.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/veikk_vdev.c b/veikk_vdev.c +index 9d0b49f..83e9efa 100644 +--- a/veikk_vdev.c ++++ b/veikk_vdev.c +@@ -6,7 +6,13 @@ + * - Set up the module parameters + */ + ++#include ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0) + #include ++#else ++#include ++#endif + #include + #include "veikk.h" + +-- +2.49.0 + From 38b936056fdeebe9d7f69d58cadd54b0dccb39b7 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 25 May 2025 00:37:46 +0200 Subject: [PATCH 004/103] linuxPackages.veikk-linux-driver: small improvements - use finalAttrs - use src.tag - add installPhase hooks - remove `with lib;` from meta --- .../linux/veikk-linux-driver/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/veikk-linux-driver/default.nix b/pkgs/os-specific/linux/veikk-linux-driver/default.nix index 81111d4e710e..7663707fe662 100644 --- a/pkgs/os-specific/linux/veikk-linux-driver/default.nix +++ b/pkgs/os-specific/linux/veikk-linux-driver/default.nix @@ -6,15 +6,15 @@ kernelModuleMakeFlags, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "veikk-linux-driver"; version = "2.0"; src = fetchFromGitHub { owner = "jlam55555"; - repo = pname; - rev = "v${version}"; - sha256 = "11mg74ds58jwvdmi3i7c4chxs6v9g09r9ll22pc2kbxjdnrp8zrn"; + repo = "veikk-linux-driver"; + tag = "v${finalAttrs.version}"; + sha256 = "sha256-Nn90s22yrynYFYLSlBN4aRvdISPsxBFr21yiohs5r4Y="; }; patches = [ ./fix-6.12-build.patch ]; @@ -28,16 +28,20 @@ stdenv.mkDerivation rec { ]; installPhase = '' + runHook preInstall + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk install -Dm755 veikk.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/veikk + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Linux driver for VEIKK-brand digitizers"; homepage = "https://github.com/jlam55555/veikk-linux-driver/"; - license = licenses.gpl2Only; - platforms = platforms.linux; - maintainers = with maintainers; [ nicbk ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nicbk ]; broken = kernel.kernelOlder "4.19"; }; -} +}) From 231a5993606cbf1d729447c887515b64c6174ede Mon Sep 17 00:00:00 2001 From: eljamm Date: Sun, 25 May 2025 01:53:00 +0200 Subject: [PATCH 005/103] linuxPackages.rtl8821cu: unstable-2024-09-27 -> unstable-2025-05-08 Which also fixes builds with newer kernels. --- pkgs/os-specific/linux/rtl8821cu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 063c50e7c25b..cff86b4a6920 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "rtl8821cu"; - version = "${kernel.version}-unstable-2024-09-27"; + version = "${kernel.version}-unstable-2025-05-08"; src = fetchFromGitHub { owner = "morrownr"; repo = "8821cu-20210916"; - rev = "2dce552dc6aa0cdab427bfa810c3df002eab0078"; - hash = "sha256-8hGAfZyDCGl0RnPnYjc7iMEulZvoIGe2ghfIfoiz7ZI="; + rev = "d74134a1c68f59f2b80cdd6c6afb8c1a8a687cbf"; + hash = "sha256-ExT7ONQeejFoMwUUXKua7wMnRi+3IYayLmlWIEWteK4="; }; hardeningDisable = [ "pic" ]; From 136d3d5cb1ac2cd8ecd39b5ac2bdfde91b7c8536 Mon Sep 17 00:00:00 2001 From: Mistyttm Date: Wed, 7 May 2025 18:14:39 +1000 Subject: [PATCH 006/103] nixos/mautrix-discord: init mautrix-discord module Co-authored-by: William Co-authored-by: Robin --- .../manual/release-notes/rl-2511.section.md | 2 + nixos/modules/module-list.nix | 1 + .../services/matrix/mautrix-discord.nix | 538 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/matrix/mautrix-discord.nix | 168 ++++++ 5 files changed, 710 insertions(+) create mode 100644 nixos/modules/services/matrix/mautrix-discord.nix create mode 100644 nixos/tests/matrix/mautrix-discord.nix diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md index fa08bb988f7e..dd403dbcda20 100644 --- a/nixos/doc/manual/release-notes/rl-2511.section.md +++ b/nixos/doc/manual/release-notes/rl-2511.section.md @@ -28,6 +28,8 @@ [dwl](https://codeberg.org/dwl/dwl), a compact, hackable compositor for Wayland based on wlroots. Available as [programs.dwl](#opt-programs.dwl.enable). +- [mautrix-discord](https://github.com/mautrix/discord), a Matrix-Discord puppeting/relay bridge. Available as [services.mautrix-discord](#opt-services.mautrix-discord.enable). + ## Backward Incompatibilities {#sec-release-25.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 34419e33f3f3..92e919ecbfaf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -764,6 +764,7 @@ ./services/matrix/lk-jwt-service.nix ./services/matrix/matrix-alertmanager.nix ./services/matrix/maubot.nix + ./services/matrix/mautrix-discord.nix ./services/matrix/mautrix-meta.nix ./services/matrix/mautrix-signal.nix ./services/matrix/mautrix-telegram.nix diff --git a/nixos/modules/services/matrix/mautrix-discord.nix b/nixos/modules/services/matrix/mautrix-discord.nix new file mode 100644 index 000000000000..e4c5fa304223 --- /dev/null +++ b/nixos/modules/services/matrix/mautrix-discord.nix @@ -0,0 +1,538 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.mautrix-discord; + dataDir = cfg.dataDir; + format = pkgs.formats.yaml { }; + + registrationFile = "${dataDir}/discord-registration.yaml"; + + settingsFile = "${dataDir}/config.yaml"; + settingsFileUnformatted = format.generate "discord-config-unsubstituted.yaml" cfg.settings; +in +{ + options = { + services.mautrix-discord = { + enable = lib.mkEnableOption "Mautrix-Discord, a Matrix-Discord puppeting/relay-bot bridge"; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.mautrix-discord; + defaultText = lib.literalExpression "pkgs.mautrix-discord"; + description = '' + The mautrix-discord package to use. + ''; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + + config = { + _module.args = { inherit cfg lib; }; + }; + + options = { + homeserver = lib.mkOption { + type = lib.types.attrs; + default = { + software = "standard"; + status_endpoint = null; + message_send_checkpoint_endpoint = null; + async_media = false; + websocket = false; + ping_interval_seconds = 0; + }; + description = '' + fullDataDiration. + See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml) + for more information. + ''; + }; + + appservice = lib.mkOption { + type = lib.types.attrs; + default = { + address = "http://localhost:8009"; + port = 8009; + id = "discord"; + bot = { + username = "discordbot"; + displayname = "Discord bridge bot"; + avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC"; + }; + as_token = "generate"; + hs_token = "generate"; + database = { + type = "sqlite3"; + uri = "file:/var/lib/mautrix-discord/mautrix-discord.db?_txlock=immediate"; + }; + }; + defaultText = lib.literalExpression '' + { + address = "http://localhost:8009"; + port = 8009; + id = "discord"; + bot = { + username = "discordbot"; + displayname = "Discord bridge bot"; + avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC"; + }; + as_token = "generate"; + hs_token = "generate"; + database = { + type = "sqlite3"; + uri = "file:''${config.services.mautrix-discord.dataDir}/mautrix-discord.db?_txlock=immediate"; + }; + } + ''; + description = '' + Appservice configuration. + See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml) + for more information. + ''; + }; + + bridge = lib.mkOption { + type = lib.types.attrs; + default = { + username_template = "discord_{{.}}"; + displayname_template = "{{or .GlobalName .Username}}{{if .Bot}} (bot){{end}}"; + channel_name_template = "{{if or (eq .Type 3) (eq .Type 4)}}{{.Name}}{{else}}#{{.Name}}{{end}}"; + guild_name_template = "{{.Name}}"; + private_chat_portal_meta = "default"; + public_address = null; + avatar_proxy_key = "generate"; + portal_message_buffer = 128; + startup_private_channel_create_limit = 5; + delivery_receipts = false; + message_status_events = false; + message_error_notices = true; + restricted_rooms = true; + autojoin_thread_on_open = true; + embed_fields_as_tables = true; + mute_channels_on_create = false; + sync_direct_chat_list = false; + resend_bridge_info = false; + custom_emoji_reactions = true; + delete_portal_on_channel_delete = false; + delete_guild_on_leave = true; + federate_rooms = true; + prefix_webhook_messages = false; + enable_webhook_avatars = true; + use_discord_cdn_upload = true; + cache_media = "unencrypted"; + direct_media = { + enabled = false; + server_name = "discord-media.example.com"; + allow_proxy = true; + server_key = "generate"; + }; + animated_sticker = { + target = "webp"; + args = { + width = 320; + height = 320; + fps = 25; + }; + }; + command_prefix = "!discord"; + management_room_text = { + welcome = "Hello, I'm a Discord bridge bot."; + welcome_connected = "Use `help` for help."; + welcome_unconnected = "Use `help` for help or `login` to log in."; + additional_help = ""; + }; + backfill = { + forward_limits = { + initial = { + dm = 0; + channel = 0; + thread = 0; + }; + missed = { + dm = 0; + channel = 0; + thread = 0; + }; + max_guild_members = -1; + }; + }; + encryption = { + allow = false; + default = false; + appservice = false; + msc4190 = false; + require = false; + allow_key_sharing = false; + plaintext_mentions = false; + delete_keys = { + delete_outbound_on_ack = false; + dont_store_outbound = false; + ratchet_on_decrypt = false; + delete_fully_used_on_decrypt = false; + delete_prev_on_new_session = false; + delete_on_device_delete = false; + periodically_delete_expired = false; + delete_outdated_inbound = false; + }; + verification_levels = { + receive = "unverified"; + send = "unverified"; + share = "cross-signed-tofu"; + }; + rotation = { + enable_custom = false; + milliseconds = 604800000; + messages = 100; + disable_device_change_key_rotation = false; + }; + }; + provisioning = { + prefix = "/_matrix/provision"; + shared_secret = "generate"; + debug_endpoints = false; + }; + permissions = { + "*" = "relay"; + # "example.com" = "user"; + # "@admin:example.com": "admin"; + }; + }; + description = '' + Bridge configuration. + See [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml) + for more information. + ''; + }; + }; + }; + default = { }; + example = lib.literalExpression '' + { + homeserver = { + address = "http://localhost:8008"; + domain = "public-domain.tld"; + }; + + appservice.public = { + prefix = "/public"; + external = "https://public-appservice-address/public"; + }; + + bridge.permissions = { + "example.com" = "full"; + "@admin:example.com" = "admin"; + }; + } + ''; + description = '' + {file}`config.yaml` configuration as a Nix attribute set. + Configuration options should match those described in + [example-config.yaml](https://github.com/mautrix/discord/blob/main/example-config.yaml). + ''; + }; + + registerToSynapse = lib.mkOption { + type = lib.types.bool; + default = config.services.matrix-synapse.enable; + defaultText = lib.literalExpression "config.services.matrix-synapse.enable"; + description = '' + Whether to add the bridge's app service registration file to + `services.matrix-synapse.settings.app_service_config_files`. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + default = "/var/lib/mautrix-discord"; + defaultText = "/var/lib/mautrix-discord"; + description = '' + Directory to store the bridge's configuration and database files. + This directory will be created if it does not exist. + ''; + }; + + # TODO: Get upstream to add an environment File option. Refer to https://github.com/NixOS/nixpkgs/pull/404871#issuecomment-2895663652 and https://github.com/mautrix/discord/issues/187 + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + File containing environment variables to substitute when copying the configuration + out of Nix store to the `services.mautrix-discord.dataDir`. + Can be used for storing the secrets without making them available in the Nix store. + For example, you can set `services.mautrix-discord.settings.appservice.as_token = "$MAUTRIX_DISCORD_APPSERVICE_AS_TOKEN"` + and then specify `MAUTRIX_DISCORD_APPSERVICE_AS_TOKEN="{token}"` in the environment file. + This value will get substituted into the configuration file as a token. + ''; + }; + + serviceUnit = lib.mkOption { + type = lib.types.str; + readOnly = true; + default = "mautrix-discord.service"; + description = '' + The systemd unit (a service or a target) for other services to depend on if they + need to be started after matrix-synapse. + This option is useful as the actual parent unit for all matrix-synapse processes + changes when configuring workers. + ''; + }; + + registrationServiceUnit = lib.mkOption { + type = lib.types.str; + readOnly = true; + default = "mautrix-discord-registration.service"; + description = '' + The registration service that generates the registration file. + Systemd unit (a service or a target) for other services to depend on if they + need to be started after mautrix-discord registration service. + This option is useful as the actual parent unit for all matrix-synapse processes + changes when configuring workers. + ''; + }; + + serviceDependencies = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = + [ cfg.registrationServiceUnit ] + ++ (lib.lists.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) + ++ (lib.lists.optional config.services.matrix-conduit.enable "matrix-conduit.service") + ++ (lib.lists.optional config.services.dendrite.enable "dendrite.service"); + + defaultText = '' + [ cfg.registrationServiceUnit ] ++ + (lib.lists.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit) ++ + (lib.lists.optional config.services.matrix-conduit.enable "matrix-conduit.service") ++ + (lib.lists.optional config.services.dendrite.enable "dendrite.service"); + ''; + description = '' + List of Systemd services to require and wait for when starting the application service. + ''; + }; + }; + }; + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + cfg.settings.homeserver.domain or "" != "" && cfg.settings.homeserver.address or "" != ""; + message = '' + The options with information about the homeserver: + `services.mautrix-discord.settings.homeserver.domain` and + `services.mautrix-discord.settings.homeserver.address` have to be set. + ''; + } + { + assertion = cfg.settings.bridge.permissions or { } != { }; + message = '' + The option `services.mautrix-discord.settings.bridge.permissions` has to be set. + ''; + } + { + assertion = cfg.settings.appservice.id != ""; + message = '' + The option `services.mautrix-discord.settings.appservice.id` has to be set. + ''; + } + { + assertion = cfg.settings.appservice.bot.username != ""; + message = '' + The option `services.mautrix-discord.settings.appservice.bot.username` has to be set. + ''; + } + ]; + + users.users.mautrix-discord = { + isSystemUser = true; + group = "mautrix-discord"; + extraGroups = [ "mautrix-discord-registration" ]; + home = dataDir; + description = "Mautrix-Discord bridge user"; + }; + + users.groups.mautrix-discord = { }; + users.groups.mautrix-discord-registration = { + members = lib.lists.optional config.services.matrix-synapse.enable "matrix-synapse"; + }; + + services.matrix-synapse = lib.mkIf cfg.registerToSynapse { + settings.app_service_config_files = [ registrationFile ]; + }; + + systemd.tmpfiles.rules = [ + "d ${cfg.dataDir} 770 mautrix-discord mautrix-discord -" + ]; + + systemd.services = { + matrix-synapse = lib.mkIf cfg.registerToSynapse { + serviceConfig.SupplementaryGroups = [ "mautrix-discord-registration" ]; + # Make synapse depend on the registration service when auto-registering + wants = [ "mautrix-discord-registration.service" ]; + after = [ "mautrix-discord-registration.service" ]; + }; + + mautrix-discord-registration = { + description = "Mautrix-Discord registration generation service"; + + wantedBy = lib.mkIf cfg.registerToSynapse [ "multi-user.target" ]; + before = lib.mkIf cfg.registerToSynapse [ "matrix-synapse.service" ]; + + path = [ + pkgs.yq + pkgs.envsubst + cfg.package + ]; + + script = '' + # substitute the settings file by environment variables + # in this case read from EnvironmentFile + rm -f '${settingsFile}' + old_umask=$(umask) + umask 0177 + envsubst \ + -o '${settingsFile}' \ + -i '${settingsFileUnformatted}' + config_has_tokens=$(yq '.appservice | has("as_token") and has("hs_token")' '${settingsFile}') + registration_already_exists=$([[ -f '${registrationFile}' ]] && echo "true" || echo "false") + echo "There are tokens in the config: $config_has_tokens" + echo "Registration already existed: $registration_already_exists" + # tokens not configured from config/environment file, and registration file + # is already generated, override tokens in config to make sure they are not lost + if [[ $config_has_tokens == "false" && $registration_already_exists == "true" ]]; then + echo "Copying as_token, hs_token from registration into configuration" + yq -sY '.[0].appservice.as_token = .[1].as_token + | .[0].appservice.hs_token = .[1].hs_token + | .[0]' '${settingsFile}' '${registrationFile}' \ + > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + fi + # make sure --generate-registration does not affect config.yaml + cp '${settingsFile}' '${settingsFile}.tmp' + echo "Generating registration file" + mautrix-discord \ + --generate-registration \ + --config='${settingsFile}.tmp' \ + --registration='${registrationFile}' + rm '${settingsFile}.tmp' + # no tokens configured, and new were just generated by generate registration for first time + if [[ $config_has_tokens == "false" && $registration_already_exists == "false" ]]; then + echo "Copying newly generated as_token, hs_token from registration into configuration" + yq -sY '.[0].appservice.as_token = .[1].as_token + | .[0].appservice.hs_token = .[1].hs_token + | .[0]' '${settingsFile}' '${registrationFile}' \ + > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + fi + # make sure --generate-registration does not affect config.yaml + cp '${settingsFile}' '${settingsFile}.tmp' + echo "Generating registration file" + mautrix-discord \ + --generate-registration \ + --config='${settingsFile}.tmp' \ + --registration='${registrationFile}' + rm '${settingsFile}.tmp' + # no tokens configured, and new were just generated by generate registration for first time + if [[ $config_has_tokens == "false" && $registration_already_exists == "false" ]]; then + echo "Copying newly generated as_token, hs_token from registration into configuration" + yq -sY '.[0].appservice.as_token = .[1].as_token + | .[0].appservice.hs_token = .[1].hs_token + | .[0]' '${settingsFile}' '${registrationFile}' \ + > '${settingsFile}.tmp' + mv '${settingsFile}.tmp' '${settingsFile}' + fi + # Make sure correct tokens are in the registration file + if [[ $config_has_tokens == "true" || $registration_already_exists == "true" ]]; then + echo "Copying as_token, hs_token from configuration to the registration file" + yq -sY '.[1].as_token = .[0].appservice.as_token + | .[1].hs_token = .[0].appservice.hs_token + | .[1]' '${settingsFile}' '${registrationFile}' \ + > '${registrationFile}.tmp' + mv '${registrationFile}.tmp' '${registrationFile}' + fi + umask $old_umask + chown :mautrix-discord-registration '${registrationFile}' + chmod 640 '${registrationFile}' + ''; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + UMask = 27; + + User = "mautrix-discord"; + Group = "mautrix-discord"; + + SystemCallFilter = [ "@system-service" ]; + + ProtectSystem = "strict"; + ProtectHome = true; + + ReadWritePaths = [ dataDir ]; + StateDirectory = "mautrix-discord"; + EnvironmentFile = cfg.environmentFile; + }; + + restartTriggers = [ settingsFileUnformatted ]; + }; + + mautrix-discord = { + description = "Mautrix-Discord, a Matrix-Discord puppeting/relaybot bridge"; + + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ] ++ cfg.serviceDependencies; + after = [ "network-online.target" ] ++ cfg.serviceDependencies; + path = [ + pkgs.lottieconverter + pkgs.ffmpeg-headless + ]; + + serviceConfig = { + Type = "simple"; + User = "mautrix-discord"; + Group = "mautrix-discord"; + PrivateUsers = true; + Restart = "on-failure"; + RestartSec = 30; + WorkingDirectory = dataDir; + ExecStart = '' + ${lib.getExe cfg.package} \ + --config='${settingsFile}' + ''; + EnvironmentFile = cfg.environmentFile; + + ProtectSystem = "strict"; + ProtectHome = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + PrivateDevices = true; + PrivateTmp = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + LockPersonality = true; + ProtectKernelLogs = true; + ProtectHostname = true; + ProtectClock = true; + + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = "@system-service"; + ReadWritePaths = [ cfg.dataDir ]; + }; + + restartTriggers = [ settingsFileUnformatted ]; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ + mistyttm + ]; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6612389caa09..3915b6c02463 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -801,6 +801,7 @@ in matrix-continuwuity = runTest ./matrix/continuwuity.nix; matrix-synapse = runTest ./matrix/synapse.nix; matrix-synapse-workers = runTest ./matrix/synapse-workers.nix; + mautrix-discord = runTest ./matrix/mautrix-discord.nix; mattermost = handleTest ./mattermost { }; mautrix-meta-postgres = runTest ./matrix/mautrix-meta-postgres.nix; mautrix-meta-sqlite = runTest ./matrix/mautrix-meta-sqlite.nix; diff --git a/nixos/tests/matrix/mautrix-discord.nix b/nixos/tests/matrix/mautrix-discord.nix new file mode 100644 index 000000000000..ebb296416fa1 --- /dev/null +++ b/nixos/tests/matrix/mautrix-discord.nix @@ -0,0 +1,168 @@ +{ pkgs, ... }: +let + homeserverUrl = "http://homeserver:8008"; +in +{ + name = "mautrix-discord"; + meta.maintainers = pkgs.mautrix-discord.meta.maintainers; + + nodes = { + homeserver = + { pkgs, ... }: + { + services.matrix-synapse = { + enable = true; + settings = { + server_name = "homeserver"; + database.name = "sqlite3"; + + enable_registration = true; + # don't use this in production, always use some form of verification + enable_registration_without_verification = true; + + listeners = [ + { + bind_addresses = [ "0.0.0.0" ]; + port = 8008; + resources = [ + { + "compress" = true; + "names" = [ "client" ]; + } + { + "compress" = false; + "names" = [ "federation" ]; + } + ]; + tls = false; + type = "http"; + } + ]; + }; + }; + + services.mautrix-discord = { + enable = true; + registerToSynapse = true; # Enable automatic registration + + settings = { + homeserver = { + address = homeserverUrl; + domain = "homeserver"; + }; + + appservice = { + address = "http://homeserver:8009"; + port = 8009; + id = "discord"; + bot = { + username = "discordbot"; + displayname = "Discord bridge bot"; + avatar = "mxc://maunium.net/nIdEykemnwdisvHbpxflpDlC"; + }; + # These will be generated automatically + as_token = "generate"; + hs_token = "generate"; + + database = { + type = "sqlite3"; + uri = "file:/var/lib/mautrix-discord/mautrix-discord.db?_txlock=immediate"; + }; + }; + + bridge = { + permissions = { + "@alice:homeserver" = "user"; + "*" = "relay"; + }; + }; + }; + }; + + networking.firewall.allowedTCPPorts = [ + 8008 + 8009 + ]; + }; + + client = + { pkgs, ... }: + { + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "do_test" + { + libraries = [ pkgs.python3Packages.matrix-nio ]; + flakeIgnore = [ + "F401" # imported but unused + "E302" # expected 2 blank lines + ]; + } + '' + import sys + import asyncio + from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse + + + async def message_callback(matrix: AsyncClient, msg: str, _r, e): + print(f"Received message: {msg}") + + + async def run(homeserver: str): + client = AsyncClient(homeserver, "@test:homeserver") + + # Register a new user + response = await client.register("test", "password123") + if not response.transport_response.ok: + print(f"Failed to register: {response}") + return False + + # Login + response = await client.login("password123") + if not response.transport_response.ok: + print(f"Failed to login: {response}") + return False + + print("Successfully logged in and basic functionality works") + await client.close() + return True + + + if __name__ == "__main__": + if len(sys.argv) != 2: + print("Usage: do_test ") + sys.exit(1) + + homeserver_url = sys.argv[1] + success = asyncio.run(run(homeserver_url)) + sys.exit(0 if success else 1) + '' + ) + ]; + }; + }; + + testScript = '' + start_all() + + with subtest("wait for homeserver and bridge to be ready"): + homeserver.wait_for_unit("matrix-synapse.service") + homeserver.wait_for_open_port(8008) + homeserver.wait_for_unit("mautrix-discord.service") + homeserver.wait_for_open_port(8009) + + with subtest("verify registration file was created"): + homeserver.wait_until_succeeds("test -f /var/lib/mautrix-discord/discord-registration.yaml") + homeserver.succeed("ls -la /var/lib/mautrix-discord/") + + with subtest("verify bridge connects to homeserver"): + # Give the bridge a moment to connect + homeserver.sleep(5) + + # Check that the bridge is running and listening + homeserver.succeed("systemctl is-active mautrix-discord.service") + homeserver.succeed("netstat -tlnp | grep :8009") + + with subtest("test basic matrix functionality"): + client.succeed("do_test ${homeserverUrl} >&2") + ''; +} From 829ec53f616e91a1586e67cf11d7761ecc819821 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Jun 2025 16:53:45 +0000 Subject: [PATCH 007/103] waydroid: 1.5.1 -> 1.5.2 --- pkgs/by-name/wa/waydroid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 3f968e65745c..c4c6128770e7 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -21,14 +21,14 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.5.1"; + version = "1.5.2"; format = "other"; src = fetchFromGitHub { owner = "waydroid"; repo = "waydroid"; tag = version; - hash = "sha256-G/JQR1C4osbZDUQSqLu48C468W6f2SeNkogVEiGhnmA="; + hash = "sha256-wDLnkHcVdHqjaR1Sfu+bhfZO2nfHadG3LgJtYJw6bsQ="; }; patches = [ From 42680527c075f0650e43521633fb4f412b3f6bc9 Mon Sep 17 00:00:00 2001 From: Asier Armenteros Date: Mon, 9 Jun 2025 10:26:12 +0000 Subject: [PATCH 008/103] psudohash: 1.0.2 -> 1.1.0 --- pkgs/by-name/ps/psudohash/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ps/psudohash/package.nix b/pkgs/by-name/ps/psudohash/package.nix index d373f631ad54..e8ca15edd221 100644 --- a/pkgs/by-name/ps/psudohash/package.nix +++ b/pkgs/by-name/ps/psudohash/package.nix @@ -1,22 +1,24 @@ { lib, - stdenv, fetchFromGitHub, - python3, + python3Packages, }: -stdenv.mkDerivation rec { +python3Packages.buildPythonApplication rec { pname = "psudohash"; - version = "1.0.2"; + version = "1.1.0"; + pyproject = false; src = fetchFromGitHub { owner = "t3l3machus"; repo = "psudohash"; tag = "v${version}"; - hash = "sha256-l/Rp9405Wf6vh85PFrRTtTLJE7GPODowseNqEw42J18="; + hash = "sha256-I/vHQraGmIWmx/v+szL5ZQJpjkSBaCpEx0r4Mc6FgKA="; }; - buildInputs = [ python3 ]; + dependencies = with python3Packages; [ + tqdm + ]; installPhase = '' runHook preInstall From aadd7d26b326940e18c786abfd0d5e01fcc93d96 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 13 Jun 2025 01:38:58 +0200 Subject: [PATCH 009/103] opensnitch: add `package` option --- nixos/modules/services/security/opensnitch.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/opensnitch.nix b/nixos/modules/services/security/opensnitch.nix index c56501c98a5f..7695231226bf 100644 --- a/nixos/modules/services/security/opensnitch.nix +++ b/nixos/modules/services/security/opensnitch.nix @@ -13,12 +13,12 @@ let file = pkgs.writeText "rule" (builtins.toJSON cfg); } ); - in { options = { services.opensnitch = { enable = lib.mkEnableOption "Opensnitch application firewall"; + package = lib.mkPackageOption pkgs "opensnitch" { }; rules = lib.mkOption { default = { }; @@ -192,13 +192,13 @@ in services.opensnitch.settings = lib.mapAttrs (_: v: lib.mkDefault v) ( builtins.fromJSON ( builtins.unsafeDiscardStringContext ( - builtins.readFile "${pkgs.opensnitch}/etc/opensnitchd/default-config.json" + builtins.readFile "${cfg.package}/etc/opensnitchd/default-config.json" ) ) ); systemd = { - packages = [ pkgs.opensnitch ]; + packages = [ cfg.package ]; services.opensnitchd = { wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -210,7 +210,7 @@ in in [ "" - "${pkgs.opensnitch}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}" + "${cfg.package}/bin/opensnitchd --config-file ${format.generate "default-config.json" preparedSettings}" ]; }; preStart = lib.mkIf (cfg.rules != { }) ( @@ -245,7 +245,7 @@ in }; tmpfiles.rules = [ "d ${cfg.settings.Rules.Path} 0750 root root - -" - "L+ /etc/opensnitchd/system-fw.json - - - - ${pkgs.opensnitch}/etc/opensnitchd/system-fw.json" + "L+ /etc/opensnitchd/system-fw.json - - - - ${cfg.package}/etc/opensnitchd/system-fw.json" ]; }; From 5b63890c4a31d15e674aa431e4d060f18a4d8a46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 15 Jun 2025 05:57:55 +0000 Subject: [PATCH 010/103] pmbootstrap: 3.4.2 -> 3.5.0 --- pkgs/by-name/pm/pmbootstrap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 0b71d0e307e9..609ff67fed80 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.4.2"; + version = "3.5.0"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = "pmbootstrap"; tag = version; - hash = "sha256-5N8yAd/1gSzHP2wXpqZb+LpylQ/LYspJ+YaY2YaWCSs="; + hash = "sha256-wdJl7DrSm1Jht0KEqZ9+qjqlkE+Y6oBdzEHTCgIGJ84="; domain = "gitlab.postmarketos.org"; }; From 6741a7d5256d7e8177e8a6679a752b97fdc82588 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 15 Jun 2025 23:25:20 +0800 Subject: [PATCH 011/103] epapirus-icon-theme: drop --- pkgs/data/icons/papirus-icon-theme/default.nix | 7 +------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 73103d19964b..54632e1b4bd8 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -4,11 +4,9 @@ fetchFromGitHub, gtk3, breeze-icons, - elementary-icon-theme, hicolor-icon-theme, papirus-folders, color ? null, - withElementary ? false, gitUpdater, }: @@ -32,9 +30,6 @@ stdenvNoCC.mkDerivation rec { [ breeze-icons hicolor-icon-theme - ] - ++ lib.optional withElementary [ - elementary-icon-theme ]; dontDropIconThemeCache = true; @@ -43,7 +38,7 @@ stdenvNoCC.mkDerivation rec { runHook preInstall mkdir -p $out/share/icons - mv ${lib.optionalString withElementary "{,e}"}Papirus* $out/share/icons + mv Papirus* $out/share/icons for theme in $out/share/icons/*; do ${lib.optionalString ( diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eee5469f6913..c02a19f71bf1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -617,6 +617,7 @@ mapAliases { EmptyEpsilon = empty-epsilon; # Added 2024-07-14 enyo-doom = enyo-launcher; # Added 2022-09-09 eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15 + epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15 epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19 ephemeral = throw "'ephemeral' has been archived upstream since 2022-04-02"; # added 2025-04-12 epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f588d01d107..8ad12cffccf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11612,8 +11612,6 @@ with pkgs; documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - epapirus-icon-theme = papirus-icon-theme.override { withElementary = true; }; - moeli = eduli; emojione = callPackage ../data/fonts/emojione { @@ -11748,7 +11746,6 @@ with pkgs; openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf" ]; }; papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { - inherit (pantheon) elementary-icon-theme; inherit (plasma5Packages) breeze-icons; }; From 97d1f7e0a005c146d360c6bd61f0e0a860c63024 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 15 Jun 2025 19:56:09 +0200 Subject: [PATCH 012/103] qt6gtk2: 0.4-unstable-2025-05-11 -> 0.5 https://www.opencode.net/trialuser/qt6gtk2/-/releases/0.5 https://www.opencode.net/trialuser/qt6gtk2/-/blob/0.5/ChangeLog https://www.opencode.net/trialuser/qt6gtk2/-/compare/0.4...0.5 Signed-off-by: Sefa Eyeoglu --- pkgs/tools/misc/qt6gtk2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix index 6aec3673d423..b2ffaac64abe 100644 --- a/pkgs/tools/misc/qt6gtk2/default.nix +++ b/pkgs/tools/misc/qt6gtk2/default.nix @@ -6,19 +6,19 @@ pkg-config, qmake, qtbase, - unstableGitUpdater, + nix-update-script, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "qt6gtk2"; - version = "0.4-unstable-2025-05-11"; + version = "0.5"; src = fetchFromGitLab { domain = "opencode.net"; owner = "trialuser"; repo = "qt6gtk2"; - rev = "a95d620193bfc3a2d5e17c3d1c883849182f77b8"; - hash = "sha256-gcCujWImw7WOnz7QI4h4ye/v5EZWVIq5eFLYoOxYoog="; + tag = finalAttrs.version; + hash = "sha256-G2TQ4LU8Cmvd+u6/s1ugbUkZcRXHTBm3+ISY0g/5/60="; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation { "PLUGINDIR=${placeholder "out"}/${qtbase.qtPluginPrefix}" ]; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = nix-update-script { }; meta = { description = "GTK+2.0 integration plugins for Qt6"; @@ -45,4 +45,4 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.misterio77 ]; platforms = lib.platforms.linux; }; -} +}) From 9ad8aaaaf150abc277858e44212479500b695ae2 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 11 Jun 2025 11:09:44 +0200 Subject: [PATCH 013/103] python313Packages.qtile: 0.31.0 -> 0.32.0 --- pkgs/development/python-modules/qtile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile/default.nix b/pkgs/development/python-modules/qtile/default.nix index 63d39dc595c1..2c6a0ffac9dd 100644 --- a/pkgs/development/python-modules/qtile/default.nix +++ b/pkgs/development/python-modules/qtile/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "qtile"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; tag = "v${version}"; - hash = "sha256-aBVIkyR906+vSLDNxvkmWu6DBujZHErSi+aZPVMRuCI="; + hash = "sha256-UF4gRmcevtH9WNA7g/pwcciJcDariXcMNpqya68mQ38="; }; patches = [ From 9258f5aef29fb08f795ee151c710e815c3870788 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 11 Jun 2025 11:09:53 +0200 Subject: [PATCH 014/103] python313Packages.qtile-extras: 0.31.0 -> 0.32.0 Changelog: https://github.com/elParaguayo/qtile-extras/blob/v0.32.0/CHANGELOG --- pkgs/development/python-modules/qtile-extras/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index bc9352edcde3..f3d3cdb312b5 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -10,6 +10,7 @@ pulseaudio, pytest-asyncio, pytest-lazy-fixture, + pytest-rerunfailures, pytestCheckHook, python-dateutil, qtile, @@ -20,14 +21,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.31.0"; + version = "0.32.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; tag = "v${version}"; - hash = "sha256-87xdSw4JKQyb/jpfTUkFDjHvKgPKzu+rKLGeaAzP8NI="; + hash = "sha256-NMbgSStXJV8fVtula1cyIwFlD8WrO8kBnOphDxbig04="; }; build-system = [ setuptools-scm ]; @@ -41,6 +42,7 @@ buildPythonPackage rec { pulseaudio pytest-asyncio pytest-lazy-fixture + pytest-rerunfailures pytestCheckHook python-dateutil qtile @@ -87,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extra modules and widgets for the Qtile tiling window manager"; homepage = "https://github.com/elParaguayo/qtile-extras"; - changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.rev}/CHANGELOG"; + changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.tag}/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ arjan-s ]; }; From 51fdb4f3106a96e9a7f3de19561b7704556254d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jun 2025 01:34:09 +0000 Subject: [PATCH 015/103] notepad-next: 0.11 -> 0.12 --- pkgs/by-name/no/notepad-next/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/notepad-next/package.nix b/pkgs/by-name/no/notepad-next/package.nix index ab44de46b983..32760a7495cf 100644 --- a/pkgs/by-name/no/notepad-next/package.nix +++ b/pkgs/by-name/no/notepad-next/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "notepad-next"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; tag = "v${finalAttrs.version}"; - hash = "sha256-qpJXby355iSyAGzj19jJJFmFkKeBRgOGod2rrZJqU9Y="; + hash = "sha256-YD4tIPh5iJpbcDMZk334k2AV9jTVWCSGP34Mj2x0cJ0="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; From 6f65f9a7a4a606b99660442babcb70a642a26dbe Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 15 Jun 2025 23:35:11 +0800 Subject: [PATCH 016/103] papirus-icon-theme: modernize --- .../data/icons/papirus-icon-theme/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 54632e1b4bd8..39f657e3d92a 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -10,14 +10,14 @@ gitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "papirus-icon-theme"; version = "20250501"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; - repo = pname; - rev = version; + repo = "papirus-icon-theme"; + tag = finalAttrs.version; hash = "sha256-KbUjHmNzaj7XKj+MOsPM6zh2JI+HfwuXvItUVAZAClk="; }; @@ -26,11 +26,10 @@ stdenvNoCC.mkDerivation rec { papirus-folders ]; - propagatedBuildInputs = - [ - breeze-icons - hicolor-icon-theme - ]; + propagatedBuildInputs = [ + breeze-icons + hicolor-icon-theme + ]; dontDropIconThemeCache = true; @@ -41,9 +40,7 @@ stdenvNoCC.mkDerivation rec { mv Papirus* $out/share/icons for theme in $out/share/icons/*; do - ${lib.optionalString ( - color != null - ) "${papirus-folders}/bin/papirus-folders -t $theme -o -C ${color}"} + ${lib.optionalString (color != null) "papirus-folders -t $theme -o -C ${color}"} gtk-update-icon-cache --force $theme done @@ -52,15 +49,15 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { description = "Pixel perfect icon theme for Linux"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case - platforms = platforms.linux; - maintainers = with maintainers; [ + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ romildo moni ]; }; -} +}) From d30e4fe6f25fe8da485d92909ff13fff9c5b235b Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 17 Jun 2025 11:02:06 +0800 Subject: [PATCH 017/103] papirus-icon-theme: move to by-name --- .../pa/papirus-icon-theme/package.nix} | 7 +++++-- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) rename pkgs/{data/icons/papirus-icon-theme/default.nix => by-name/pa/papirus-icon-theme/package.nix} (92%) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/by-name/pa/papirus-icon-theme/package.nix similarity index 92% rename from pkgs/data/icons/papirus-icon-theme/default.nix rename to pkgs/by-name/pa/papirus-icon-theme/package.nix index 39f657e3d92a..dee8528770f7 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/by-name/pa/papirus-icon-theme/package.nix @@ -3,7 +3,7 @@ stdenvNoCC, fetchFromGitHub, gtk3, - breeze-icons, + kdePackages, hicolor-icon-theme, papirus-folders, color ? null, @@ -27,10 +27,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - breeze-icons + kdePackages.breeze-icons hicolor-icon-theme ]; + # breeze-icons propagates qtbase + dontWrapQtApps = true; + dontDropIconThemeCache = true; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ad12cffccf3..df6b54dae6ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11745,10 +11745,6 @@ with pkgs; openmoji-black = callPackage ../data/fonts/openmoji { fontFormats = [ "glyf" ]; }; - papirus-icon-theme = callPackage ../data/icons/papirus-icon-theme { - inherit (plasma5Packages) breeze-icons; - }; - papirus-maia-icon-theme = callPackage ../data/icons/papirus-maia-icon-theme { inherit (plasma5Packages) breeze-icons; }; From 092f985e159fa253b0023cf779f82019875f62ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jun 2025 15:07:02 +0000 Subject: [PATCH 018/103] sydbox: 3.35.1 -> 3.35.2 --- pkgs/by-name/sy/sydbox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix index 3a51a9ac6375..c35f55a3dc02 100644 --- a/pkgs/by-name/sy/sydbox/package.nix +++ b/pkgs/by-name/sy/sydbox/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sydbox"; - version = "3.35.1"; + version = "3.35.2"; outputs = [ "out" @@ -24,11 +24,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Sydbox"; repo = "sydbox"; tag = "v${finalAttrs.version}"; - hash = "sha256-EfsL8UEZdWRYqQ5QymteUBxtabfrHxq3WU4MMqsXWAg="; + hash = "sha256-n3mvzYXb965eUWNJ5iHezqqAZj6v05gj092osYZuk5s="; }; useFetchCargoVendor = true; - cargoHash = "sha256-ckeOk4/fpJ9J8JV/NT0D/0jXUOt4ub+m+6ZBUpBEs08="; + cargoHash = "sha256-D0lUkiARl0QL2OsojaJqsACn2fmN9x8Jp7mZzyRjyWY="; nativeBuildInputs = [ mandoc From 2b48c0cee095d32f58048d76ec0961067d162bb5 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Wed, 18 Jun 2025 18:36:28 +0200 Subject: [PATCH 019/103] niri: add doc output --- pkgs/by-name/ni/niri/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index 3c473ac59cd2..e5d20785b6ec 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -36,6 +36,11 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs="; }; + outputs = [ + "out" + "doc" + ]; + postPatch = '' patchShebangs resources/niri-session substituteInPlace resources/niri.service \ @@ -78,6 +83,9 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' + install -Dm0644 README.md resources/default-config.kdl -t $doc/share/doc/niri + mv wiki $doc/share/doc/niri/wiki + install -Dm0644 resources/niri.desktop -t $out/share/wayland-sessions '' + lib.optionalString withDbus '' From abbb454ec90590c85ed9eba67c53c8400d57bd0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Jun 2025 19:33:17 +0000 Subject: [PATCH 020/103] obs-studio-plugins.droidcam-obs: 2.3.4 -> 2.4.0 --- .../video/obs-studio/plugins/droidcam-obs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index 07b8110070fc..31012612ed85 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; - version = "2.3.4"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; tag = finalAttrs.version; - sha256 = "sha256-KWMLhddK561xA+EjvoG4tXRW4xoLil31JcTTfppblmA="; + sha256 = "sha256-rA+EMtAeM2LSUqtiYJt0hHZ85aZ+5bvVUUjIG2LC3pc="; }; preBuild = '' From a36f4d2795ebb01e8eeba3a681b46c6db6d9cbe0 Mon Sep 17 00:00:00 2001 From: willow <52585984+Kek5chen@users.noreply.github.com> Date: Wed, 18 Jun 2025 21:38:21 +0200 Subject: [PATCH 021/103] ryubing: gate x11 videodriver on linux --- pkgs/by-name/ry/ryubing/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index f8bca0586c66..fc86129a49a7 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -96,7 +96,7 @@ buildDotnetModule rec { "Ryujinx" ]; - makeWrapperArgs = [ + makeWrapperArgs = lib.optional stdenv.hostPlatform.isLinux [ # Without this Ryujinx fails to start on wayland. See https://github.com/Ryujinx/Ryujinx/issues/2714 "--set SDL_VIDEODRIVER x11" ]; From c486acca90880b41a11d05df16e110ce7cb42106 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 19 Jun 2025 08:48:32 +0200 Subject: [PATCH 022/103] python3Packages.yargy: fix typo in meta.homepage --- pkgs/development/python-modules/yargy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yargy/default.nix b/pkgs/development/python-modules/yargy/default.nix index b4350676665f..1b13419b04bb 100644 --- a/pkgs/development/python-modules/yargy/default.nix +++ b/pkgs/development/python-modules/yargy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rule-based facts extraction for Russian language"; - homepage = "https://github.com/natasha/yargu"; + homepage = "https://github.com/natasha/yargy"; license = licenses.mit; maintainers = with maintainers; [ npatsakula ]; }; From 4c0595b0267a857279b37deefab9bb9221dee880 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 19 Jun 2025 08:53:38 +0200 Subject: [PATCH 023/103] rhino: point meta.homepage to a working page --- pkgs/development/libraries/java/rhino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 1d8c54faed15..8016c7374ea3 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { to provide scripting to end users. ''; - homepage = "http://www.mozilla.org/rhino/"; + homepage = "https://rhino.github.io/"; license = with licenses; [ mpl11 # or From b7a50a29b6dc1189398303239f25c1eaf5421009 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 19 Jun 2025 08:57:07 +0200 Subject: [PATCH 024/103] linuxPackages.rtl8821cu: fix github project name in meta.homepage --- pkgs/os-specific/linux/rtl8821cu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 063c50e7c25b..32aa13cb81b5 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Realtek rtl8821cu driver"; - homepage = "https://github.com/morrownr/8821cu"; + homepage = "https://github.com/morrownr/8821cu-20210916"; license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.contrun ]; From 8615db5da2c2f794406ced93d938ea602d46fc41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Jun 2025 01:45:51 +0000 Subject: [PATCH 025/103] openmm: 8.2.0 -> 8.3.0 --- pkgs/by-name/op/openmm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix index 0ffc4da34d1f..4f8c4ba7077e 100644 --- a/pkgs/by-name/op/openmm/package.nix +++ b/pkgs/by-name/op/openmm/package.nix @@ -18,15 +18,15 @@ addDriverRunpath, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openmm"; - version = "8.2.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "openmm"; repo = "openmm"; - rev = version; - hash = "sha256-p0zjr8ONqGK4Vbnhljt16DeyeZ0bR1kE+YdiIlw/1L0="; + rev = finalAttrs.version; + hash = "sha256-wXk5s6OascFWjHs4WpxGU9TcX0gSiOZ3BRusIH1NjpI="; }; # "This test is stochastic and may occasionally fail". It does. @@ -128,4 +128,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.sheepforce ]; }; -} +}) From e6a949f3d609642cadb26b2e663f38223588d38c Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Tue, 17 Jun 2025 09:33:26 +0200 Subject: [PATCH 026/103] python3Packages.pdbfixer: 1.10 -> 1.11 --- pkgs/development/python-modules/pdbfixer/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdbfixer/default.nix b/pkgs/development/python-modules/pdbfixer/default.nix index f140a4cf9c5d..aed34f07d255 100644 --- a/pkgs/development/python-modules/pdbfixer/default.nix +++ b/pkgs/development/python-modules/pdbfixer/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pdbfixer"; - version = "1.10"; + version = "1.11"; pyproject = true; src = fetchFromGitHub { owner = "openmm"; repo = "pdbfixer"; tag = "v${version}"; - hash = "sha256-7bg/i7nhbBw/DCc7Rabt5pwUUPF27Iiy2dMQnV6GTiM="; + hash = "sha256-Xk3m2w1p3Wu4g6qKGOH679wkKT0LKZLgGn/ARn219fQ="; }; nativeBuildInputs = [ @@ -48,6 +48,10 @@ buildPythonPackage rec { "test_mutate_multiple_copies_of_chain_A" "test_pdbid" "test_url" + "test_charge_and_solvate" + "test_download_template" + "test_nonstandard" + "test_leaving_atoms" ]; pythonImportsCheck = [ "pdbfixer" ]; From e91c7d3524409b285c287f94093267edb463ed99 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 14 Jun 2025 16:02:29 +0200 Subject: [PATCH 027/103] flint: fix windows build --- pkgs/development/libraries/flint/3.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/flint/3.nix b/pkgs/development/libraries/flint/3.nix index e6566d706a27..971598950740 100644 --- a/pkgs/development/libraries/flint/3.nix +++ b/pkgs/development/libraries/flint/3.nix @@ -5,6 +5,7 @@ gmp, mpfr, ntl, + windows, autoconf, automake, gettext, @@ -13,7 +14,7 @@ blas, lapack, withBlas ? true, - withNtl ? true, + withNtl ? !ntl.meta.broken, }: assert @@ -49,6 +50,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withNtl [ ntl + ] + ++ lib.optionals stdenv.hostPlatform.isMinGW [ + windows.mingw_w64_pthreads ]; # We're not using autoreconfHook because flint's bootstrap @@ -79,7 +83,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl3Plus; maintainers = with maintainers; [ smasher164 ]; teams = [ teams.sage ]; - platforms = platforms.unix; + platforms = platforms.all; homepage = "https://www.flintlib.org/"; downloadPage = "https://www.flintlib.org/downloads.html"; }; From 895c88736bee93a171e5a0357bc92b0dc075e82e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 00:35:25 +0000 Subject: [PATCH 028/103] mpich: 4.3.0 -> 4.3.1 --- pkgs/development/libraries/mpich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index a1b153b5dfed..7c837e67a39f 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -32,11 +32,11 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric"); stdenv.mkDerivation rec { pname = "mpich"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz"; - hash = "sha256-XgQTKYStg8q5zFP3YHLSte9abSSwqf+QR6j/lhIbzGM="; + hash = "sha256-rMEcsr3Glnjci7p0fCSigjPFhZb4HwN4W/K3u3oO99w="; }; patches = [ From 99a08ff39ce2b4865e8ea231d8b956f90177240a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 04:47:41 +0000 Subject: [PATCH 029/103] albert: 0.28.0 -> 0.28.2 --- pkgs/by-name/al/albert/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix index e7f04a96aa5f..d432e3752f6f 100644 --- a/pkgs/by-name/al/albert/package.nix +++ b/pkgs/by-name/al/albert/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.28.0"; + version = "0.28.2"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; tag = "v${finalAttrs.version}"; - hash = "sha256-ciqCNQD5S7qv9Ph6AgUpFB5Sphv6Eb1LR3Ap3bTd1EE="; + hash = "sha256-FYl/S7+KoQ3kgUQX0hiv8B+AbTbyfmo1GX130G09bZ8="; fetchSubmodules = true; }; From c2de182b93e08f231cb180399e114d7b69f63625 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 21 Jun 2025 10:11:50 +0200 Subject: [PATCH 030/103] python3.pkgs.standard-nntplib: init at 3.13.0 --- .../standard-nntplib/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 3 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/standard-nntplib/default.nix diff --git a/pkgs/development/python-modules/standard-nntplib/default.nix b/pkgs/development/python-modules/standard-nntplib/default.nix new file mode 100644 index 000000000000..b88cf58a7126 --- /dev/null +++ b/pkgs/development/python-modules/standard-nntplib/default.nix @@ -0,0 +1,37 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "standard-nntplib"; + version = "3.13.0"; + pyproject = true; + + disabled = pythonOlder "3.13"; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-J8c55f527QGcK8p/QKJBZeZV0y9DU0iM1RUFVkWh2Hc="; + sparseCheckout = [ "nntplib" ]; + }; + + build-system = [ setuptools ]; + sourceRoot = "${src.name}/nntplib"; + + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "nntplib" ]; + + meta = { + description = "Standard library nntplib redistribution"; + homepage = "https://github.com/youknowone/python-deadlib"; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.qyliss ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b091dda03be..0ed8a52e3646 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16954,6 +16954,9 @@ self: super: with self; { standard-mailcap = if pythonOlder "3.13" then null else callPackage ../development/python-modules/standard-mailcap { }; + standard-nntplib = + if pythonOlder "3.13" then null else callPackage ../development/python-modules/standard-nntplib { }; + standard-pipes = if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null; From 82bdd923e53dd616609f7142c8a6b7f64bd3bfe4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 21 Jun 2025 10:12:06 +0200 Subject: [PATCH 031/103] mailman: add missing standard-nntplib dependency Required with Python 3.13. --- pkgs/servers/mail/mailman/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index cb5dc354cf74..d008f2389d62 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { python-dateutil requests sqlalchemy + standard-nntplib zope-component zope-configuration ]; From be2ebf5421eddf2efb0968bb0f0f69934e26f2ef Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 21 Jun 2025 10:16:42 +0200 Subject: [PATCH 032/103] mailman: backport Python 3.13 fix Fixes: https://github.com/NixOS/nixpkgs/issues/418498 --- pkgs/servers/mail/mailman/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index d008f2389d62..68b38c51aebf 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -60,6 +60,11 @@ buildPythonPackage rec { url = "https://gitlab.com/mailman/mailman/-/commit/9613154f3c04fa2383fbf017031ef263c291418d.patch"; sha256 = "0vyw87s857vfxbf7kihwb6w094xyxmxbi1bpdqi3ybjamjycp55r"; }) + (fetchpatch { + name = "python-3.13.patch"; + url = "https://gitlab.com/mailman/mailman/-/commit/685d9a7bdbd382d9e8d4a2da74bd973e93356e05.patch"; + hash = "sha256-KCXVP+5zqgluUXQCGmMRC+G1hEDnFBlTUETGpmFDOOk="; + }) ./log-stderr.patch ]; From 14bb8fd59d0ede3dedb19534bc9244459a7b2758 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 11:10:52 +0000 Subject: [PATCH 033/103] lux-cli: 0.7.1 -> 0.7.3 --- pkgs/by-name/lu/lux-cli/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index 077dc9dd00c7..8a6453fc5ce7 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -17,18 +17,18 @@ rustPlatform.buildRustPackage rec { pname = "lux-cli"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "nvim-neorocks"; repo = "lux"; - tag = "v0.7.1"; - hash = "sha256-x5Bs/Zq0gfJAC3VFKG1hCg95IZ0qpgf8kBfFccP5HgU="; + tag = "v0.7.3"; + hash = "sha256-d/WznA6BRduQJOFlE+ll1H7XtGXs9BPrhAKST09Lh0s="; }; buildAndTestSubdir = "lux-cli"; useFetchCargoVendor = true; - cargoHash = "sha256-lGQToe1nM6tjcoxYy94wiGMevm3/B7MD6NOIX61GpMA="; + cargoHash = "sha256-B1Fu5KWLL/XuUvIROPh0huLw4/OHe/c+LC0/gRFpBnc="; nativeInstallCheckInputs = [ versionCheckHook From b3f406280660fe251caca6d2db31d1eebb6b4f5e Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 21 Jun 2025 19:28:15 +0800 Subject: [PATCH 034/103] tbb_2021: 2021.13.0 -> 2021.12.0 --- pkgs/by-name/tb/tbb_2021/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tb/tbb_2021/package.nix b/pkgs/by-name/tb/tbb_2021/package.nix index bddbb1a546fe..d20f88c6681a 100644 --- a/pkgs/by-name/tb/tbb_2021/package.nix +++ b/pkgs/by-name/tb/tbb_2021/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "tbb"; - version = "2021.13.0"; + version = "2021.12.0"; outputs = [ "out" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "oneapi-src"; repo = "oneTBB"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZoUzY71SweVQ8/1k09MNSXiEqab6Ae+QTbxORnar9JU="; + hash = "sha256-yG/Fs+3f9hNKzZ8le+W7+JDZk9hMzPsVAzbq0yTcUTc="; }; nativeBuildInputs = [ From 4ad1d5e5ac29e8ff2a47709e94bd55e58d774538 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jun 2025 15:48:54 +0200 Subject: [PATCH 035/103] exploitdb: 2025-06-14 -> 2025-06-21 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-06-14...2025-06-21 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index c32e0b4b7d1d..3490a80f9cac 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-06-14"; + version = "2025-06-21"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-znJZK7EhLFg2ImxWqEfvt7Em+M8lAly+oPzrmaGznRU="; + hash = "sha256-6mXku+SW6xmSYxd40Ilis8H/2Ozm6eUecLQHy1xeKtM="; }; nativeBuildInputs = [ makeWrapper ]; From 9538821df97280e3956b709acd0b91f5551ac608 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Jun 2025 16:58:04 +0300 Subject: [PATCH 036/103] linux-firmware: switch to fetching from gitlab, drop custom update script --- pkgs/by-name/li/linux-firmware/package.nix | 9 +++++---- pkgs/by-name/li/linux-firmware/update.sh | 10 ---------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100755 pkgs/by-name/li/linux-firmware/update.sh diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index e1a6f4e9fade..c099eac43352 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -1,6 +1,6 @@ { stdenvNoCC, - fetchzip, + fetchFromGitLab, lib, python3, rdfind, @@ -24,8 +24,10 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; version = "20250613"; - src = fetchzip { - url = "https://cdn.kernel.org/pub/linux/kernel/firmware/linux-firmware-${version}.tar.xz"; + src = fetchFromGitLab { + owner = "kernel-firmware"; + repo = "linux-firmware"; + rev = version; hash = "sha256-qygwQNl99oeHiCksaPqxxeH+H7hqRjbqN++Hf9X+gzs="; }; @@ -57,5 +59,4 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ fpletz ]; priority = 6; # give precedence to kernel firmware }; - passthru.updateScript = ./update.sh; } diff --git a/pkgs/by-name/li/linux-firmware/update.sh b/pkgs/by-name/li/linux-firmware/update.sh deleted file mode 100755 index 7886e93571ab..000000000000 --- a/pkgs/by-name/li/linux-firmware/update.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p git -p common-updater-scripts - -set -eu -o pipefail - -repo="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" - -revision="$(git ls-remote --refs --tags --sort refname "$repo" | tail -n1 | cut -f2 | cut -d '/' -f3)" - -update-source-version linux-firmware "$revision" From dbc32032cfdd48e04ffc08b37ad198c7b42866fd Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Jun 2025 17:05:51 +0300 Subject: [PATCH 037/103] linux-firmware: 20250613 -> 20250621 (unstable) --- pkgs/by-name/li/linux-firmware/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index c099eac43352..0d5d85f58ec5 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -22,13 +22,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20250613"; + version = "20250621"; # not a real tag, but the current stable tag breaks some AMD GPUs entirely src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; - rev = version; - hash = "sha256-qygwQNl99oeHiCksaPqxxeH+H7hqRjbqN++Hf9X+gzs="; + rev = "49c833a10ad96a61a218d28028aed20aeeac124c"; + hash = "sha256-Pz/k/ol0NRIHv/AdridwoBPDLsd0rfDAj31Paq4mPpU="; }; postUnpack = '' From 722f90bf434191dce73b9e0d432e6634efd6f7cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 18:18:46 +0000 Subject: [PATCH 038/103] shopware-cli: 0.6.8 -> 0.6.10 --- pkgs/by-name/sh/shopware-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shopware-cli/package.nix b/pkgs/by-name/sh/shopware-cli/package.nix index de01cc520de0..5877748ae454 100644 --- a/pkgs/by-name/sh/shopware-cli/package.nix +++ b/pkgs/by-name/sh/shopware-cli/package.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "shopware-cli"; - version = "0.6.8"; + version = "0.6.10"; src = fetchFromGitHub { repo = "shopware-cli"; owner = "FriendsOfShopware"; tag = version; - hash = "sha256-vLy3HWHfsUaf80iuBUYYAP87wJNke8/h48r3Db18kFQ="; + hash = "sha256-kzf54rPac/OYmmqEAoQPWFjtzMj0FOGOMoxdX2zlX8s="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ buildGoModule rec { dart-sass ]; - vendorHash = "sha256-pidR7b4k3PG9FVHJ5oWz2nYtCZwE8SlBjQqqvyFPNzM="; + vendorHash = "sha256-gw0O9cLRkCo8FMlUSgVsL7c5xSSP7sAcwL/WUAy6MiI="; postInstall = '' installShellCompletion --cmd shopware-cli \ From 5913a02f2ab041a469e13e5e681a259166279077 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 21 Jun 2025 21:05:53 +0200 Subject: [PATCH 039/103] libvncserver: enable tests during shared library builds Also skips shell test that doesn't work OOTB, but we don't need --- pkgs/by-name/li/libvncserver/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index ecaceb3c56ad..5daa8e6d1f17 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -44,8 +44,17 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_SYSTEMD" withSystemd) (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "WITH_EXAMPLES" buildExamples) + (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) ]; + # This test checks if using the **installed** headers works. + # As it doesn't set the include paths correctly, and we have nixpkgs-review to check if + # packages continue to build, patching it would serve no purpose, so we can just remove the test entirely. + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'add_test(NAME includetest COMMAND' '# add_test(NAME includetest COMMAND' + ''; + buildInputs = [ libjpeg @@ -61,6 +70,8 @@ stdenv.mkDerivation (finalAttrs: { zlib ]; + doCheck = enableShared; + meta = with lib; { description = "VNC server library"; homepage = "https://libvnc.github.io/"; From 25a49a439ccb405c055fa8846249c0e66d9cd925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 22:05:36 +0000 Subject: [PATCH 040/103] python3Packages.djangocms-alias: 2.0.3 -> 2.0.4 --- pkgs/development/python-modules/djangocms-alias/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix index 4fef532d870d..44d1c027b75e 100644 --- a/pkgs/development/python-modules/djangocms-alias/default.nix +++ b/pkgs/development/python-modules/djangocms-alias/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "djangocms-alias"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "django-cms"; repo = "djangocms-alias"; tag = version; - hash = "sha256-q5iNTnoPto7jgxF/46I0oA8NYFBbDafsRUFmKMFoQM4="; + hash = "sha256-0lIhPgI+HbAKX9wEpZ/v40OHvN6WWK9ehFxIcpzdcq8="; }; build-system = [ setuptools ]; From 6e7d987ac75b8b5451b06ae959f251367c7c1c77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Jun 2025 23:53:41 +0000 Subject: [PATCH 041/103] readarr: 0.4.17.2801 -> 0.4.18.2805 --- pkgs/by-name/re/readarr/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/re/readarr/package.nix b/pkgs/by-name/re/readarr/package.nix index ae9b7581894e..5f2874bd8c3c 100644 --- a/pkgs/by-name/re/readarr/package.nix +++ b/pkgs/by-name/re/readarr/package.nix @@ -24,15 +24,15 @@ let ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-3Oir/a5TwaCraYierE6pPPZWYObNOD6+V7olw/HmckM="; - arm64-linux_hash = "sha256-B/Or5hdqMxqQEmBULG+Z1JqlL9Kdk5M6SBdjhbfMBZA="; - x64-osx_hash = "sha256-FYfX50pomjlB/oGVeIHqYvZ00S1SSgBaVB7R8150rvY="; + x64-linux_hash = "sha256-hCqxH6xPLhA+V7reqsHi1EY2sU3HJ6ESMJiiWXrcUUE="; + arm64-linux_hash = "sha256-7NpH32tkEOYVyfwIBq9LCKAo0IQ1IehYfKi+qiBzf8o="; + x64-osx_hash = "sha256-ypzOWXxtzvOTgTmU7pQ1cS+FcyNCOo5R2Z4l5Mk+4wA="; } ."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.4.17.2801"; + version = "0.4.18.2805"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; From 140f6f1fa50037070c0f747b35242101d8f5d879 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 00:31:55 +0000 Subject: [PATCH 042/103] spytrap-adb: 0.3.4 -> 0.3.5 --- pkgs/by-name/sp/spytrap-adb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spytrap-adb/package.nix b/pkgs/by-name/sp/spytrap-adb/package.nix index c830c0a1abf0..93b14647dd98 100644 --- a/pkgs/by-name/sp/spytrap-adb/package.nix +++ b/pkgs/by-name/sp/spytrap-adb/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec { pname = "spytrap-adb"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "spytrap-org"; repo = "spytrap-adb"; tag = "v${version}"; - hash = "sha256-Yqa+JmqYCmy9ehxmRebPNlU5U2RPHtnHDHiqSg8EvAo="; + hash = "sha256-t5MNgsuH5FVEjUP9FFxbjXs5BVim0ZyfNKUTQOjKpqg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-hXDxo0b2nJbPyo99Qc39LM0P41SDbyfadHLIRrbQdj0="; + cargoHash = "sha256-VoUzAHTxJLeyi60ftuOkI6PAuLUsSsQSUjk9rcGz86A="; env.SPYTRAP_ADB_BINARY = lib.getExe' android-tools "adb"; From e80dd5608e093823d0a8e1be4c1bb83f59fe1242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 00:34:20 +0000 Subject: [PATCH 043/103] sudo: 1.9.16p2 -> 1.9.17 --- pkgs/by-name/su/sudo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/sudo/package.nix b/pkgs/by-name/su/sudo/package.nix index 31ddf4d3af1f..34b1a8e98e16 100644 --- a/pkgs/by-name/su/sudo/package.nix +++ b/pkgs/by-name/su/sudo/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sudo"; # be sure to check if nixos/modules/security/sudo.nix needs updating when bumping # e.g. links to man pages, value constraints etc. - version = "1.9.16p2"; + version = "1.9.17"; __structuredAttrs = true; src = fetchurl { url = "https://www.sudo.ws/dist/sudo-${finalAttrs.version}.tar.gz"; - hash = "sha256-l2qlbT47KnVZMweGQoit23SMnBNuJdlanMaZqvp3I5w="; + hash = "sha256-PyEsadU01YIrSS0JmrsCpZP5HKmfWv3ly5vT4dza0Gk="; }; prePatch = '' From c49b43f2df6a6c4e174a32a0f7fb251927013099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 00:40:09 +0000 Subject: [PATCH 044/103] qpwgraph: 0.9.3 -> 0.9.4 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 31295e4d3071..6a41d5c38731 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6aJymZjuUMezEbOosveXyiY7y+XgGk3E8Dd4tb8UyrU="; + sha256 = "sha256-VvOdorj+CpFSI+iyVeMR0enXGO5mLPE8KiaHGuG/KDQ="; }; nativeBuildInputs = [ From dd6b96f5f0737689f166d77f00a4e176eddf762c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 01:09:47 +0000 Subject: [PATCH 045/103] libretro.flycast: 0-unstable-2025-06-06 -> 0-unstable-2025-06-20 --- pkgs/applications/emulators/libretro/cores/flycast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index b497f3d0d18d..96397f706a3e 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-06-06"; + version = "0-unstable-2025-06-20"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "8f033723a1b3437c8e3c8b42a92331eebe53ed0b"; - hash = "sha256-RrWBN8RDAS7RcIOouU3x2Pv/RKrshrmmmCZCeXQ6upk="; + rev = "449d256995de36de0629dd1b97f4d67a0e50c92e"; + hash = "sha256-7+Dn7+AUnd3+eEKRMuahaxiEMWTT1uUEP2y0ZgIs81Q="; fetchSubmodules = true; }; From 1a30d1eb095836d516419e1d656dec15faa99dc3 Mon Sep 17 00:00:00 2001 From: kuflierl <41301536+kuflierl@users.noreply.github.com> Date: Sun, 22 Jun 2025 03:18:19 +0200 Subject: [PATCH 046/103] python313Packages.litemapy: 0.10.0b0 -> 0.11.0b0, add maintainer kuflierl Diff: https://github.com/SmylerMC/litemapy/compare/v0.10.0b0...v0.11.0b0 Changelog: https://github.com/SmylerMC/litemapy/blob/v0.11.0b0/CHANGELOG.md --- pkgs/development/python-modules/litemapy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/litemapy/default.nix b/pkgs/development/python-modules/litemapy/default.nix index 02e321182f05..0f3ec4659100 100644 --- a/pkgs/development/python-modules/litemapy/default.nix +++ b/pkgs/development/python-modules/litemapy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "litemapy"; - version = "0.10.0b0"; + version = "0.11.0b0"; pyproject = true; build-system = [ setuptools ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "SmylerMC"; repo = "litemapy"; rev = "v${version}"; - hash = "sha256-mGRnrFfrg0VD9pXs0WOuiP6QnYyu0Jbv/bqCWtkOie0="; + hash = "sha256-jqJYiggAs/JA+CJ35HzpsIQA/5p8PRFkbmPlwJvTI28="; }; propagatedBuildInputs = [ @@ -34,6 +34,9 @@ buildPythonPackage rec { homepage = "https://github.com/SmylerMC/litemapy"; changelog = "https://github.com/SmylerMC/litemapy/blob/${src.rev}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ gdd ]; + maintainers = with maintainers; [ + gdd + kuflierl + ]; }; } From a150d661481ae1b889e1e21eee70bdfade31df4d Mon Sep 17 00:00:00 2001 From: HHR2020 <76608828+HHR2020@users.noreply.github.com> Date: Sun, 22 Jun 2025 11:37:53 +0800 Subject: [PATCH 047/103] kinfocenter: hardcode path for sensors --- .../plasma/kinfocenter/0001-tool-paths.patch | 82 ++++++++++++------- pkgs/kde/plasma/kinfocenter/default.nix | 2 + 2 files changed, 56 insertions(+), 28 deletions(-) diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 54e5fbb1c2b4..818b3489aaeb 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,8 +1,8 @@ diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json -index d94ef1d0..13f1c377 100644 +index 7ece92ee..a4fb6664 100644 --- a/kcms/audio_information/kcm_audio_information.json +++ b/kcms/audio_information/kcm_audio_information.json -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ "Name[zh_CN]": "音频", "Name[zh_TW]": "音訊" }, @@ -25,10 +25,10 @@ index adb196fd..9d6c8675 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json -index a73e33ad..3a1ab4da 100644 +index f73cf5a5..b18ecbfb 100644 --- a/kcms/block_devices/kcm_block_devices.json +++ b/kcms/block_devices/kcm_block_devices.json -@@ -80,7 +80,7 @@ +@@ -82,7 +82,7 @@ "Name[zh_CN]": "块设备", "Name[zh_TW]": "區塊裝置" }, @@ -51,10 +51,10 @@ index 2de923f3..6b14f7fb 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json -index a783b5bc..5866c4d2 100644 +index e8fb086e..c87b98f8 100644 --- a/kcms/cpu/kcm_cpu.json +++ b/kcms/cpu/kcm_cpu.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "CPU", "Name[zh_TW]": "CPU" }, @@ -90,12 +90,12 @@ index da803598..4e24eaaf 100755 printf "%s\n\n" "$data" done diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json -index 68e4e670..19dfdc59 100644 +index e180df8d..3d5bbd0b 100644 --- a/kcms/edid/kcm_edid.json +++ b/kcms/edid/kcm_edid.json -@@ -64,7 +64,7 @@ - "Name[x-test]": "xxEDIDxx", - "Name[zh_CN]": "EDID" +@@ -72,7 +72,7 @@ + "Name[zh_CN]": "EDID", + "Name[zh_TW]": "EDID" }, - "TryExec": "di-edid-decode", + "TryExec": "@di_edid_decode@", @@ -116,10 +116,10 @@ index 9f04e7fd..8ef37d2c 100644 [[nodiscard]] CommandOutputContext *outputContext() const { diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json -index 1cc89eb2..f1aed6c3 100644 +index 02a90071..64bfb609 100644 --- a/kcms/egl/kcm_egl.json +++ b/kcms/egl/kcm_egl.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "OpenGL (EGL)", "Name[zh_TW]": "OpenGL (EGL)" }, @@ -155,10 +155,10 @@ index eab20e0f..5a0d2499 100644 {executable}, Qt::TextFormat::RichText, diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json -index 640ef4a5..791e8ce9 100644 +index 8a56690a..e2caaec7 100644 --- a/kcms/glx/kcm_glx.json +++ b/kcms/glx/kcm_glx.json -@@ -101,7 +101,7 @@ +@@ -103,7 +103,7 @@ "Name[zh_CN]": "OpenGL (GLX)", "Name[zh_TW]": "OpenGL (GLX)" }, @@ -197,10 +197,10 @@ index 11921934..1160c5f0 100644 KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args) diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index 24dc11a7..bc72f2af 100644 +index 9e502d52..f9f26cbd 100644 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -93,6 +93,6 @@ +@@ -95,6 +95,6 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" }, @@ -222,10 +222,10 @@ index ddb55b5c..8dc6b668 100644 parent); } diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json -index 54f729ec..8e7aeb57 100644 +index 20df9662..6a64c762 100644 --- a/kcms/memory/kcm_memory.json +++ b/kcms/memory/kcm_memory.json -@@ -132,7 +132,7 @@ +@@ -134,7 +134,7 @@ "Name[zh_CN]": "内存", "Name[zh_TW]": "記憶體" }, @@ -235,10 +235,10 @@ index 54f729ec..8e7aeb57 100644 "X-KDE-Keywords": "Memory,RAM,dmidecode", "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية", diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json -index 65e929e2..20bc2289 100644 +index 5fc677a5..59ec49da 100644 --- a/kcms/network/kcm_network.json +++ b/kcms/network/kcm_network.json -@@ -147,7 +147,7 @@ +@@ -148,7 +148,7 @@ "Name[zh_CN]": "网络接口", "Name[zh_TW]": "網路介面" }, @@ -261,10 +261,10 @@ index f02577a3..479e18df 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json -index 774dd42e..40e2076a 100644 +index 61706cb9..b7fb9c59 100644 --- a/kcms/opencl/kcm_opencl.json +++ b/kcms/opencl/kcm_opencl.json -@@ -90,7 +90,7 @@ +@@ -92,7 +92,7 @@ "Name[zh_CN]": "OpenCL", "Name[zh_TW]": "OpenCL" }, @@ -299,11 +299,37 @@ index 36d82ef8..16ce2703 100644 set(PCI_BACKEND_ARGUMENTS "-v") endif() +diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json +index e1994f2c..e1c27245 100644 +--- a/kcms/sensors/kcm_sensors.json ++++ b/kcms/sensors/kcm_sensors.json +@@ -58,7 +58,7 @@ + "Name[zh_CN]": "传感器", + "Name[zh_TW]": "感測器" + }, +- "TryExec": "sensors", ++ "TryExec": "@sensors@", + "X-KDE-KInfoCenter-Category": "device_information", + "X-KDE-Keywords": "lm_sensors,sensors,temp,temperature,volt,voltage,sensors,fan,fan speed,monitoring,amp,amps,current,power", + "X-KDE-Keywords[ar]": "مستشعرات lm,مستشعرات,درجة الحرارة,درجة الحرارة,فولت,جهد,مستشعرات,مروحة,سرعة المروحة,مراقبة,أمبير,أمبير,تيار,طاقة", +diff --git a/kcms/sensors/main.cpp b/kcms/sensors/main.cpp +index 8dae9f8f..ee70f381 100644 +--- a/kcms/sensors/main.cpp ++++ b/kcms/sensors/main.cpp +@@ -18,7 +18,7 @@ public: + explicit KCMSensors(QObject *parent, const KPluginMetaData &data) + : KQuickConfigModule(parent, data) + { +- m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent); ++ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent); + m_outputContext->setAutoRefreshMs(1000); + } + CommandOutputContext *outputContext() const diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json -index 78b42cfd..1ec93c91 100644 +index 9a297a07..2c30b20a 100644 --- a/kcms/vulkan/kcm_vulkan.json +++ b/kcms/vulkan/kcm_vulkan.json -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ "Name[zh_CN]": "Vulkan", "Name[zh_TW]": "Vulkan" }, @@ -326,10 +352,10 @@ index 5665d9d2..008f1bf0 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json -index 9ae953bb..27d98104 100644 +index 66022b79..1756eb0e 100644 --- a/kcms/wayland/kcm_wayland.json +++ b/kcms/wayland/kcm_wayland.json -@@ -107,7 +107,7 @@ +@@ -108,7 +108,7 @@ "Name[zh_CN]": "Wayland", "Name[zh_TW]": "Wayland" }, @@ -352,10 +378,10 @@ index 3a4825c7..4633927b 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json -index f5642e25..11f108a7 100644 +index a5e64d94..81190779 100644 --- a/kcms/xserver/kcm_xserver.json +++ b/kcms/xserver/kcm_xserver.json -@@ -147,7 +147,7 @@ +@@ -148,7 +148,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" }, diff --git a/pkgs/kde/plasma/kinfocenter/default.nix b/pkgs/kde/plasma/kinfocenter/default.nix index c6849d94c93e..2e8ebe634cd9 100644 --- a/pkgs/kde/plasma/kinfocenter/default.nix +++ b/pkgs/kde/plasma/kinfocenter/default.nix @@ -6,6 +6,7 @@ lib, libdisplay-info, libusb1, + lm_sensors, mesa-demos, mkKdeDerivation, pkg-config, @@ -33,6 +34,7 @@ let lscpu = lib.getExe' util-linux "lscpu"; pactl = lib.getExe' pulseaudio "pactl"; qdbus = lib.getExe' qttools "qdbus"; + sensors = lib.getExe' lm_sensors "sensors"; vulkaninfo = lib.getExe' vulkan-tools "vulkaninfo"; waylandinfo = lib.getExe wayland-utils; xdpyinfo = lib.getExe xdpyinfo; From 3b4d945bf7ede5d45ab1675e71c5ce4d4beac7ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 04:36:50 +0000 Subject: [PATCH 048/103] python3Packages.doc8: 1.1.2 -> 2.0.0 --- pkgs/development/python-modules/doc8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 566a60d47f2e..e8cd7f52f1f8 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "doc8"; - version = "1.1.2"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-EiXzAUThzJfjiNuvf+PpltKJdHOlOm2uJo3d4hw1S5g="; + hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA="; }; nativeBuildInputs = [ From 5b8658e3dbbd0087c2bc83d3742e7230b7892a90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Jun 2025 06:07:30 +0000 Subject: [PATCH 049/103] lemmy-ui: 0.19.11 -> 0.19.12 --- pkgs/servers/web-apps/lemmy/pin.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/web-apps/lemmy/pin.json b/pkgs/servers/web-apps/lemmy/pin.json index 074df2f75d76..7be1d7a10b8d 100644 --- a/pkgs/servers/web-apps/lemmy/pin.json +++ b/pkgs/servers/web-apps/lemmy/pin.json @@ -1,8 +1,8 @@ { - "serverVersion": "0.19.11", - "uiVersion": "0.19.11", - "serverHash": "sha256-veF+fJTjsB543PyBnnBN4rmejTWrnlnLghnP6mLDP7U=", - "serverCargoHash": "sha256-H9Eu/nKxK27OXvzPi5ItTbKcHqISKAjN17MRWsw5xlc=", - "uiHash": "sha256-K8nNb/HQy/s5S5h9Ndt3t8F9/h1D2zOGrTEKhv+Z4Ks=", - "uiPNPMDepsHash": "sha256-SqU/kYadwszogaBErP2v1VXIMhJj9AHRKdrHLc99fMw=" + "serverVersion": "0.19.12", + "uiVersion": "0.19.12", + "serverHash": "sha256-1xkm2iKoeNXuTW5ZMKPQyqePTUqKXJ5upz97MVwqjzo=", + "serverCargoHash": "sha256-QnDN0Lvfw8d5SF7nrb8hBVG2gwT1xgEhYlLElfR15Z0=", + "uiHash": "sha256-bxppQtDFgxvdeBE/8PsfBNpnEdvX8AoELyhrwEV8Hsg=", + "uiPNPMDepsHash": "sha256-tuarUG1uKx6Q1O+rF6DHyK8MEseF9lKk34qtRWWScAg=" } From 77e9e764be9194c0c2081c4df204971cbb3d9f5d Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:21 +0800 Subject: [PATCH 050/103] nixos/yazi: add ryan4yin as a maintainer --- nixos/modules/programs/yazi.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/yazi.nix b/nixos/modules/programs/yazi.nix index 8486cf611c46..6a097c8b9c9b 100644 --- a/nixos/modules/programs/yazi.nix +++ b/nixos/modules/programs/yazi.nix @@ -118,6 +118,9 @@ in }; meta = { - maintainers = with lib.maintainers; [ linsui ]; + maintainers = with lib.maintainers; [ + linsui + ryan4yin + ]; }; } From aa9343b00efa37cf84952531c18beefa0623bfba Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:21 +0800 Subject: [PATCH 051/103] nixos/minio: add ryan4yin as a maintainer --- nixos/modules/services/web-servers/minio.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix index a2e181882bc6..1f1a595f8700 100644 --- a/nixos/modules/services/web-servers/minio.nix +++ b/nixos/modules/services/web-servers/minio.nix @@ -18,7 +18,10 @@ let ''; in { - meta.maintainers = [ maintainers.bachp ]; + meta.maintainers = with maintainers; [ + bachp + ryan4yin + ]; options.services.minio = { enable = mkEnableOption "Minio Object Storage"; From 7c18f6b91ad15accbf8748c0ce2ba54b1d1ee4e5 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:21 +0800 Subject: [PATCH 052/103] nixos/tests/croc: add ryan4yin as a maintainer --- nixos/tests/croc.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index 296d12c4ebe6..f5eec96d6cc3 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -13,6 +13,7 @@ in maintainers = [ equirosa SuperSandro2000 + ryan4yin ]; }; From 2493f96246de31f0a62c76c02fd26e666148f8d0 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:22 +0800 Subject: [PATCH 053/103] nixos/tests/minio: add ryan4yin as a maintainer --- nixos/tests/minio.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index baef07aec993..bf3a74e6330d 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -48,7 +48,10 @@ in { name = "minio"; meta = with pkgs.lib.maintainers; { - maintainers = [ bachp ]; + maintainers = [ + bachp + ryan4yin + ]; }; nodes = { From 83755184e903f856c872072d600015a65e3235bf Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:22 +0800 Subject: [PATCH 054/103] aliyun-cli: add ryan4yin as a maintainer --- pkgs/by-name/al/aliyun-cli/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 36803b0c3acc..49ddc8765911 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -41,7 +41,10 @@ buildGoModule rec { homepage = "https://github.com/aliyun/aliyun-cli"; changelog = "https://github.com/aliyun/aliyun-cli/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ ornxka ]; + maintainers = with lib.maintainers; [ + ornxka + ryan4yin + ]; mainProgram = "aliyun"; }; } From 67f5e6dff28faf58fb5941d0672b638825b861dc Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:22 +0800 Subject: [PATCH 055/103] aws-iam-authenticator: add ryan4yin as a maintainer --- pkgs/by-name/aw/aws-iam-authenticator/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix index 58f8f3500613..dd8ebcf2987e 100644 --- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix +++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix @@ -37,6 +37,9 @@ buildGoModule rec { mainProgram = "aws-iam-authenticator"; changelog = "https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/tag/v${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ srhb ]; + maintainers = with lib.maintainers; [ + srhb + ryan4yin + ]; }; } From a7f28e6f2f4ae8a8b588e8f056f54a1d61730780 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:23 +0800 Subject: [PATCH 056/103] btop: add ryan4yin as a maintainer --- pkgs/by-name/bt/btop/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/bt/btop/package.nix b/pkgs/by-name/bt/btop/package.nix index 4fbf5980367b..8b9adbba4cdb 100644 --- a/pkgs/by-name/bt/btop/package.nix +++ b/pkgs/by-name/bt/btop/package.nix @@ -60,6 +60,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ khaneliman rmcgibbo + ryan4yin ]; mainProgram = "btop"; }; From ec9f940c86dc8b47c3cf2a28d073431e3894b1a5 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:23 +0800 Subject: [PATCH 057/103] caddy: add ryan4yin as a maintainer --- pkgs/by-name/ca/caddy/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index bc219a3cfbf5..2786618a4cc2 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -91,6 +91,7 @@ buildGoModule { Br1ght0ne stepbrobd techknowlogick + ryan4yin ]; }; } From 71452432b3c9d18feff2c1beec32e68536387cc4 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:23 +0800 Subject: [PATCH 058/103] cilium-cli: add ryan4yin as a maintainer --- pkgs/by-name/ci/cilium-cli/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 8b101be51027..d4018083707d 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -56,6 +56,7 @@ buildGoModule rec { bryanasdev000 humancalico qjoly + ryan4yin ]; mainProgram = "cilium"; }; From c53977c97fd8b57a8a71e11c5a9902014e34e4fe Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:24 +0800 Subject: [PATCH 059/103] croc: add ryan4yin as a maintainer --- pkgs/by-name/cr/croc/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 24e0b09ea49f..442a210c1e9b 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -47,6 +47,7 @@ buildGoModule rec { maintainers = with maintainers; [ equirosa SuperSandro2000 + ryan4yin ]; mainProgram = "croc"; }; From df6fa0fb69b2ec5795a12a8d8b69e8c8146a02f4 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:24 +0800 Subject: [PATCH 060/103] dive: add ryan4yin as a maintainer --- pkgs/by-name/di/dive/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/di/dive/package.nix b/pkgs/by-name/di/dive/package.nix index d051c1771386..0fb1072c44b5 100644 --- a/pkgs/by-name/di/dive/package.nix +++ b/pkgs/by-name/di/dive/package.nix @@ -52,6 +52,9 @@ buildGoModule rec { homepage = "https://github.com/wagoodman/dive"; changelog = "https://github.com/wagoodman/dive/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ SuperSandro2000 ]; + maintainers = with lib.maintainers; [ + SuperSandro2000 + ryan4yin + ]; }; } From 2db333d9e0cebe7fd7c811fa0d6941f61b6b3725 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:24 +0800 Subject: [PATCH 061/103] eksctl: add ryan4yin as a maintainer --- pkgs/by-name/ek/eksctl/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 0646ce5bd7f7..fc77b758e4b0 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -51,6 +51,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ xrelkd Chili-Man + ryan4yin ]; mainProgram = "eksctl"; }; From d716b30066423f3804921688c03efe0269335e3a Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:24 +0800 Subject: [PATCH 062/103] fluxcd: add ryan4yin as a maintainer --- pkgs/by-name/fl/fluxcd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index d0473a3f8cf0..c18373187ee2 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -80,6 +80,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ bryanasdev000 jlesquembre + ryan4yin ]; mainProgram = "flux"; }; From 829476d7f4713a6ca89d96ae9a5c2f1e37efc9a4 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:25 +0800 Subject: [PATCH 063/103] go-containerregistry: add ryan4yin as a maintainer --- pkgs/by-name/go/go-containerregistry/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index cfb94d695d71..465ec2435e0a 100644 --- a/pkgs/by-name/go/go-containerregistry/package.nix +++ b/pkgs/by-name/go/go-containerregistry/package.nix @@ -69,6 +69,9 @@ buildGoModule rec { homepage = "https://github.com/google/go-containerregistry"; license = licenses.asl20; mainProgram = "crane"; - maintainers = with maintainers; [ yurrriq ]; + maintainers = with maintainers; [ + yurrriq + ryan4yin + ]; }; } From 87d4264730f6a2995e5054b3542ef24ad2b7133a Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:25 +0800 Subject: [PATCH 064/103] grafana-loki: add ryan4yin as a maintainer --- pkgs/by-name/gr/grafana-loki/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index 3eddcbf947d8..c31a93d3917a 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -82,6 +82,7 @@ buildGoModule rec { globin mmahut emilylange + ryan4yin ]; }; } From 83eac324de643a21b51e82c424e8d3037de28dad Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:25 +0800 Subject: [PATCH 065/103] hyprshot: add ryan4yin as a maintainer --- pkgs/by-name/hy/hyprshot/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/hy/hyprshot/package.nix b/pkgs/by-name/hy/hyprshot/package.nix index 98666e17b84e..39a222d51ae6 100644 --- a/pkgs/by-name/hy/hyprshot/package.nix +++ b/pkgs/by-name/hy/hyprshot/package.nix @@ -52,7 +52,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/Gustash/hyprshot"; description = "Hyprshot is an utility to easily take screenshots in Hyprland using your mouse"; license = licenses.gpl3Only; - maintainers = with maintainers; [ Cryolitia ]; + maintainers = with maintainers; [ + Cryolitia + ryan4yin + ]; mainProgram = "hyprshot"; platforms = hyprland.meta.platforms; }; From b09623c62106530a06752445980bd52b1e734950 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:26 +0800 Subject: [PATCH 066/103] istioctl: add ryan4yin as a maintainer --- pkgs/by-name/is/istioctl/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index 6f711670e219..a64798bc3ccb 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -57,6 +57,7 @@ buildGoModule rec { maintainers = with maintainers; [ bryanasdev000 veehaitch + ryan4yin ]; }; } From d216d23c9609166ab19438de1a54b7cfe70cd4ba Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:26 +0800 Subject: [PATCH 067/103] just: add ryan4yin as a maintainer --- pkgs/by-name/ju/just/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 29d2b6246674..2ce78f85a987 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -116,6 +116,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ xrelkd jk + ryan4yin ]; mainProgram = "just"; }; From c4d6639a63247ee6b06b9b68a4233c8160e3fc4a Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:26 +0800 Subject: [PATCH 068/103] k9s: add ryan4yin as a maintainer --- pkgs/by-name/k9/k9s/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix index 6160f1db8478..e0f3491d2726 100644 --- a/pkgs/by-name/k9/k9s/package.nix +++ b/pkgs/by-name/k9/k9s/package.nix @@ -76,6 +76,7 @@ buildGoModule rec { bryanasdev000 qjoly devusb + ryan4yin ]; }; } From 4242df02ed9f238e9e4ea611f2b3637a85a1f50d Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:26 +0800 Subject: [PATCH 069/103] minio-client: add ryan4yin as a maintainer --- pkgs/by-name/mi/minio-client/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/minio-client/package.nix b/pkgs/by-name/mi/minio-client/package.nix index 71372676733d..fa5ae7a74d9d 100644 --- a/pkgs/by-name/mi/minio-client/package.nix +++ b/pkgs/by-name/mi/minio-client/package.nix @@ -36,7 +36,10 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/minio/mc"; description = "Replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; - maintainers = with maintainers; [ bachp ]; + maintainers = with maintainers; [ + bachp + ryan4yin + ]; mainProgram = "mc"; license = licenses.asl20; }; From 516091143570af4c8c87b768dafd627aef1ffc75 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:27 +0800 Subject: [PATCH 070/103] ncdu: add ryan4yin as a maintainer --- pkgs/by-name/nc/ncdu/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix index 1db1c17fb6b2..290a01bb35fb 100644 --- a/pkgs/by-name/nc/ncdu/package.nix +++ b/pkgs/by-name/nc/ncdu/package.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pSub rodrgz defelo + ryan4yin ]; inherit (zig_0_14.meta) platforms; mainProgram = "ncdu"; From 2d54a4e9af814ed208c06260c6d19cdeccded59f Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:27 +0800 Subject: [PATCH 071/103] qq: add ryan4yin as a maintainer --- pkgs/by-name/qq/qq/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix index fb48240150e5..1ca56f038925 100644 --- a/pkgs/by-name/qq/qq/package.nix +++ b/pkgs/by-name/qq/qq/package.nix @@ -54,6 +54,7 @@ let bot-wxt1221 fee1-dead prince213 + ryan4yin ]; }; in From 8ed73a1fdd81ea80ad1970d62478557356f16cfb Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:27 +0800 Subject: [PATCH 072/103] restic: add ryan4yin as a maintainer --- pkgs/by-name/re/restic/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/restic/package.nix b/pkgs/by-name/re/restic/package.nix index e4723e357a41..1580c2c247fd 100644 --- a/pkgs/by-name/re/restic/package.nix +++ b/pkgs/by-name/re/restic/package.nix @@ -65,9 +65,10 @@ buildGoModule rec { description = "Backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; - maintainers = [ - maintainers.mbrgm - maintainers.dotlambda + maintainers = with maintainers; [ + mbrgm + dotlambda + ryan4yin ]; mainProgram = "restic"; }; From d197b438f3421d2a74d9d87d0fe59d2b5cfa1550 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:28 +0800 Subject: [PATCH 073/103] sad: add ryan4yin as a maintainer --- pkgs/by-name/sa/sad/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sa/sad/package.nix b/pkgs/by-name/sa/sad/package.nix index 5ee30cee37e3..19ee417cf5fb 100644 --- a/pkgs/by-name/sa/sad/package.nix +++ b/pkgs/by-name/sa/sad/package.nix @@ -32,7 +32,10 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ms-jpq/sad"; changelog = "https://github.com/ms-jpq/sad/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + fab + ryan4yin + ]; mainProgram = "sad"; }; } From 30263b51750711359ae976c4bd7a0e56a36bc970 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:28 +0800 Subject: [PATCH 074/103] sftpgo: add ryan4yin as a maintainer --- pkgs/by-name/sf/sftpgo/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sf/sftpgo/package.nix b/pkgs/by-name/sf/sftpgo/package.nix index 4aa8c8faddb2..5a2b98ca953d 100644 --- a/pkgs/by-name/sf/sftpgo/package.nix +++ b/pkgs/by-name/sf/sftpgo/package.nix @@ -63,7 +63,10 @@ buildGoModule rec { agpl3Only unfreeRedistributable ]; # Software is AGPLv3, web UI is unfree - maintainers = with lib.maintainers; [ thenonameguy ]; + maintainers = with lib.maintainers; [ + thenonameguy + ryan4yin + ]; mainProgram = "sftpgo"; }; } From f24dd50d069a0911a19fccaa113a78a8f400d0da Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:28 +0800 Subject: [PATCH 075/103] skopeo: add ryan4yin as a maintainer --- pkgs/by-name/sk/skopeo/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/sk/skopeo/package.nix b/pkgs/by-name/sk/skopeo/package.nix index 9e8eeff9ad1d..335f6c5ae2c1 100644 --- a/pkgs/by-name/sk/skopeo/package.nix +++ b/pkgs/by-name/sk/skopeo/package.nix @@ -92,6 +92,7 @@ buildGoModule rec { maintainers = with maintainers; [ lewo developer-guy + ryan4yin ]; teams = [ teams.podman ]; license = licenses.asl20; From 05b716fb4872c2fb3082416964fb139e416293f2 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:29 +0800 Subject: [PATCH 076/103] socat: add ryan4yin as a maintainer --- pkgs/by-name/so/socat/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix index 257529fe2366..55fcc3bb5992 100644 --- a/pkgs/by-name/so/socat/package.nix +++ b/pkgs/by-name/so/socat/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { homepage = "http://www.dest-unreach.org/socat/"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; - maintainers = [ ]; + maintainers = with maintainers; [ ryan4yin ]; mainProgram = "socat"; }; } From 48dba1190df758e180d99314cd6a54826bc3c376 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:29 +0800 Subject: [PATCH 077/103] ssm-session-manager-plugin: add ryan4yin as a maintainer --- pkgs/by-name/ss/ssm-session-manager-plugin/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix index 4168b8b1d828..a38ba61c178d 100644 --- a/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix +++ b/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix @@ -74,6 +74,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ amarshall mbaillie + ryan4yin ]; }; } From 5e1c2b0876e1783003fa6a201136b96d3a4a750d Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:29 +0800 Subject: [PATCH 078/103] swaybg: add ryan4yin as a maintainer --- pkgs/by-name/sw/swaybg/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sw/swaybg/package.nix b/pkgs/by-name/sw/swaybg/package.nix index 2d854647d1fc..846a4d5d19b3 100644 --- a/pkgs/by-name/sw/swaybg/package.nix +++ b/pkgs/by-name/sw/swaybg/package.nix @@ -60,7 +60,10 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; mainProgram = "swaybg"; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ + primeos + ryan4yin + ]; platforms = platforms.linux; }; } From 78a9d9c698c0c0b84e66b835980264c77cdb1192 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:29 +0800 Subject: [PATCH 079/103] tailscale: add ryan4yin as a maintainer --- pkgs/by-name/ta/tailscale/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix index cec7cc8b19f5..daa8b6fb1e62 100644 --- a/pkgs/by-name/ta/tailscale/package.nix +++ b/pkgs/by-name/ta/tailscale/package.nix @@ -224,6 +224,7 @@ buildGoModule { jk mfrw pyrox0 + ryan4yin ]; }; } From 7155875ed403be8269d85532b4056d0cac3c6144 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:30 +0800 Subject: [PATCH 080/103] tealdeer: add ryan4yin as a maintainer --- pkgs/by-name/te/tealdeer/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/te/tealdeer/package.nix b/pkgs/by-name/te/tealdeer/package.nix index 27eb4d3fd6a7..e87db45d1725 100644 --- a/pkgs/by-name/te/tealdeer/package.nix +++ b/pkgs/by-name/te/tealdeer/package.nix @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage rec { davidak newam mfrw + ryan4yin ]; license = with licenses; [ asl20 From 820b64b4f35173599c4aef5831e329f18181d659 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:30 +0800 Subject: [PATCH 081/103] terraformer: add ryan4yin as a maintainer --- pkgs/by-name/te/terraformer/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/terraformer/package.nix b/pkgs/by-name/te/terraformer/package.nix index ffe8efbe0a35..478685a30813 100644 --- a/pkgs/by-name/te/terraformer/package.nix +++ b/pkgs/by-name/te/terraformer/package.nix @@ -24,6 +24,6 @@ buildGoModule rec { mainProgram = "terraformer"; homepage = "https://github.com/GoogleCloudPlatform/terraformer"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ryan4yin ]; }; } From 58bbf009d6ba491ae01c484fb893003faa7dc6ae Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:30 +0800 Subject: [PATCH 082/103] v2ray: add ryan4yin as a maintainer --- pkgs/by-name/v2/v2ray/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index 4bb399d9280a..b4ea1a5a3416 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -70,6 +70,9 @@ buildGoModule rec { description = "Platform for building proxies to bypass network restrictions"; mainProgram = "v2ray"; license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ servalcatty ]; + maintainers = with lib.maintainers; [ + servalcatty + ryan4yin + ]; }; } From cefa4685d4d892f31e348615a242886206f76021 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:31 +0800 Subject: [PATCH 083/103] zellij: add ryan4yin as a maintainer --- pkgs/by-name/ze/zellij/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ze/zellij/package.nix b/pkgs/by-name/ze/zellij/package.nix index 0c4b7e976449..f699b9a18441 100644 --- a/pkgs/by-name/ze/zellij/package.nix +++ b/pkgs/by-name/ze/zellij/package.nix @@ -92,6 +92,7 @@ rustPlatform.buildRustPackage (finalAttrs: { abbe pyrox0 matthiasbeyer + ryan4yin ]; mainProgram = "zellij"; }; From 745b2deeb737a3a0022d9635fc97b37665be8ffb Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:31 +0800 Subject: [PATCH 084/103] zoxide: add ryan4yin as a maintainer --- pkgs/by-name/zo/zoxide/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/zo/zoxide/package.nix b/pkgs/by-name/zo/zoxide/package.nix index bcd33cc1d65f..6fedee757560 100644 --- a/pkgs/by-name/zo/zoxide/package.nix +++ b/pkgs/by-name/zo/zoxide/package.nix @@ -50,6 +50,7 @@ rustPlatform.buildRustPackage rec { cole-h SuperSandro2000 matthiasbeyer + ryan4yin ]; mainProgram = "zoxide"; }; From 2bede112dc7fe7e84d0898ac41c5e966a48226dc Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:31 +0800 Subject: [PATCH 085/103] minio: add ryan4yin as a maintainer --- pkgs/servers/minio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 7f3e4104f7bd..b8bf29be44e9 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -68,7 +68,10 @@ buildGoModule rec { homepage = "https://www.minio.io/"; description = "S3-compatible object storage server"; changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${version}"; - maintainers = with maintainers; [ bachp ]; + maintainers = with maintainers; [ + bachp + ryan4yin + ]; license = licenses.agpl3Plus; mainProgram = "minio"; }; From 62d606d08ffbcf49309775de81b25822735b5e48 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:31 +0800 Subject: [PATCH 086/103] grafana: add ryan4yin as a maintainer --- pkgs/servers/monitoring/grafana/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2e212a062c8d..604163ff9fae 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -161,6 +161,7 @@ buildGoModule rec { globin ma27 Frostman + ryan4yin ]; platforms = [ "x86_64-linux" From ee19f0a079baa7ac8243c612eacc6e80faa9658f Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:31 +0800 Subject: [PATCH 087/103] nushell: add ryan4yin as a maintainer --- pkgs/shells/nushell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 8c3d3ef2b748..903cced2a9cd 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -95,6 +95,7 @@ rustPlatform.buildRustPackage { Br1ght0ne johntitor joaquintrinanes + ryan4yin ]; mainProgram = "nu"; }; From df4d48734c18fd2ae1a2c2ae0409dadef7d7f7ed Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:32 +0800 Subject: [PATCH 088/103] google-cloud-sdk: add ryan4yin as a maintainer --- pkgs/tools/admin/google-cloud-sdk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index b8fa30ba1802..c9322945a596 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -182,6 +182,7 @@ stdenv.mkDerivation rec { pradyuman stephenmw zimbatm + ryan4yin ]; platforms = builtins.attrNames data.googleCloudSdkPkgs; mainProgram = "gcloud"; From fba58b82be35a5a4c5175221b251e6eddf4f853d Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:32 +0800 Subject: [PATCH 089/103] mtr: add ryan4yin as a maintainer --- pkgs/tools/networking/mtr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index c3fc477f1c2d..f25d0109900e 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { orivej raskin globin + ryan4yin ]; mainProgram = "mtr"; platforms = platforms.unix; From 9b3dc31a6e68e1ab834c36a14e77571e60b9e485 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Sun, 22 Jun 2025 14:25:32 +0800 Subject: [PATCH 090/103] pass: add ryan4yin as a maintainer --- pkgs/tools/security/pass/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index c9382cc05547..a7644ffe4126 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -197,6 +197,7 @@ stdenv.mkDerivation rec { tadfisher globin ma27 + ryan4yin ]; platforms = platforms.unix; From fea1cb70a87c1e2b4e5240406f2cba222647d53e Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Sun, 22 Jun 2025 16:28:45 +0800 Subject: [PATCH 091/103] python3Packages.junitparser: 2.8.0 -> 3.2.0 --- .../python-modules/junitparser/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 8833775b8074..efb5b0bae7a3 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -2,34 +2,29 @@ lib, buildPythonPackage, fetchFromGitHub, - future, glibcLocales, lxml, - unittestCheckHook, + pytestCheckHook, }: buildPythonPackage rec { pname = "junitparser"; - version = "2.8.0"; + version = "3.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "weiwei"; repo = "junitparser"; rev = version; - hash = "sha256-rhDP05GSWT4K6Z2ip8C9+e3WbvBJOwP0vctvANBs7cw="; + hash = "sha256-efP9t5eto6bcjk33wpJmunLlPH7wUwAa6/OjjYG/fgM="; }; - propagatedBuildInputs = [ future ]; - nativeCheckInputs = [ - unittestCheckHook + pytestCheckHook lxml glibcLocales ]; - unittestFlagsArray = [ "-v" ]; - meta = with lib; { description = "Manipulates JUnit/xUnit Result XML files"; mainProgram = "junitparser"; From 6da24ccc7e889a6b80da047db51ee497c0f7b137 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 21 Jun 2025 23:06:24 +0200 Subject: [PATCH 092/103] hurl: fix build with libxml-2.14 --- pkgs/by-name/hu/hurl/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix index b1afe82a5f02..6a273a9db1bc 100644 --- a/pkgs/by-name/hu/hurl/package.nix +++ b/pkgs/by-name/hu/hurl/package.nix @@ -2,6 +2,7 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch2, pkg-config, installShellFiles, libxml2, @@ -24,6 +25,16 @@ rustPlatform.buildRustPackage rec { useFetchCargoVendor = true; cargoHash = "sha256-WyNActmsHpr5fgN1a3X9ApEACWFVJMVoi4fBvKhGgZ0="; + patches = [ + # Fix build with libxml-2.14, remove after next hurl release + # https://github.com/Orange-OpenSource/hurl/pull/3977 + (fetchpatch2 { + name = "fix-libxml_2_14"; + url = "https://github.com/Orange-OpenSource/hurl/commit/7c7b410c3017aeab0dfc74a6144e4cb8e186a10a.patch?full_index=1"; + hash = "sha256-XjnCRIMwzfgUMIhm6pQ90pzA+c2U0EuhyvLUZDsI2GI="; + }) + ]; + nativeBuildInputs = [ pkg-config installShellFiles From 803efcac007dc1eb38b36b851eac15caef4cc1d6 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 31 May 2025 11:49:50 +0200 Subject: [PATCH 093/103] lixPackageSets.*.lix.passthru.tests.installer: test the correct Lix for real No idea how that mistake sneaked into 9685bc5a059b1adf8455bc6c9f54e5b51a60d52a which was supposed to fix the issue. --- nixos/tests/installer.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 56f1b4f19bfb..166eb32090c6 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -722,6 +722,10 @@ let libxml2.bin libxslt.bin nixos-artwork.wallpapers.simple-dark-gray-bottom + (nixos-rebuild-ng.override { + withNgSuffix = false; + withReexec = true; + }) ntp perlPackages.ConfigIniFiles perlPackages.FileSlurp @@ -1110,7 +1114,7 @@ in simple = makeInstallerTest "simple" ( simple-test-config // { - passthru.override = args: makeInstallerTest "simple" simple-test-config // args; + passthru.override = args: makeInstallerTest "simple" (simple-test-config // args); } ); From 0a5083eb9dd3dbf1f7528f98f250d74e039246e2 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jun 2025 11:12:33 +0200 Subject: [PATCH 094/103] python3Packages.doc8: Python support starting with 3.10 --- pkgs/development/python-modules/doc8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index e8cd7f52f1f8..a2e1cab9b8c5 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "2.0.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; From 1c494aa9adb4900f62539c28050e20e621bcdbfe Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jun 2025 11:14:35 +0200 Subject: [PATCH 095/103] python3Packages.doc8: Modernize derivation --- pkgs/development/python-modules/doc8/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index a2e1cab9b8c5..1f3b4a7ba61b 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "doc8"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -26,14 +26,14 @@ buildPythonPackage rec { hash = "sha256-EmetMnWJcfvPmRRCQXo5Nce8nlJVDnNiLg5WulXqHUA="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm wheel ]; buildInputs = [ pbr ]; - propagatedBuildInputs = [ + dependencies = [ docutils chardet stevedore @@ -43,16 +43,14 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonRelaxDeps = [ "docutils" ]; - pythonImportsCheck = [ "doc8" ]; - meta = with lib; { + meta = { description = "Style checker for Sphinx (or other) RST documentation"; mainProgram = "doc8"; homepage = "https://github.com/pycqa/doc8"; changelog = "https://github.com/PyCQA/doc8/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } From 48530b3b4375a0d937dbd58e10e589e28dac5c57 Mon Sep 17 00:00:00 2001 From: emaryn Date: Fri, 20 Jun 2025 15:48:22 +0800 Subject: [PATCH 096/103] ryzen-smu: 0.1.5-unstable-2024-01-03 -> 0.1.5-unstable-2025-06-04 --- pkgs/os-specific/linux/ryzen-smu/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/ryzen-smu/default.nix b/pkgs/os-specific/linux/ryzen-smu/default.nix index 40226010ec9e..cdeac45c8e1d 100644 --- a/pkgs/os-specific/linux/ryzen-smu/default.nix +++ b/pkgs/os-specific/linux/ryzen-smu/default.nix @@ -6,17 +6,17 @@ }: let - version = "0.1.5-unstable-2024-01-03"; + version = "0.1.5-unstable-2025-06-04"; ## Upstream has not been merging PRs. ## Nixpkgs maintainers are providing a ## repo with PRs merged until upstream is ## updated. src = fetchFromGitHub { - owner = "Cryolitia"; + owner = "amkillam"; repo = "ryzen_smu"; - rev = "ce1aa918efa33ca79998f0f7d467c04d4b07016c"; - hash = "sha256-s9SSmbL6ixWqZUKEhrZdxN4xoWgk+8ClZPoKq2FDAAE="; + rev = "9f9569f889935f7c7294cc32c1467e5a4081701a"; + hash = "sha256-i8T0+kUYsFMzYO3h6ffUXP1fgGOXymC4Ml2dArQLOdk="; }; monitor-cpu = stdenv.mkDerivation { @@ -59,11 +59,11 @@ stdenv.mkDerivation { runHook postInstall ''; - meta = with lib; { + meta = { description = "Linux kernel driver that exposes access to the SMU (System Management Unit) for certain AMD Ryzen Processors"; - homepage = "https://gitlab.com/leogx9r/ryzen_smu"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ + homepage = "https://github.com/amkillam/ryzen_smu"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ Cryolitia phdyellow ]; From 625754c6ffaa5d329ea3a1797bfcb3dd2c9799d6 Mon Sep 17 00:00:00 2001 From: emaryn <197520219+emaryn@users.noreply.github.com> Date: Sat, 21 Jun 2025 03:01:15 +0000 Subject: [PATCH 097/103] ryzen-smu: add aleksana as maintainer --- pkgs/os-specific/linux/ryzen-smu/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/ryzen-smu/default.nix b/pkgs/os-specific/linux/ryzen-smu/default.nix index cdeac45c8e1d..c0704ffe41d2 100644 --- a/pkgs/os-specific/linux/ryzen-smu/default.nix +++ b/pkgs/os-specific/linux/ryzen-smu/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ Cryolitia phdyellow + aleksana ]; platforms = [ "x86_64-linux" ]; mainProgram = "monitor_cpu"; From ba79c475631ca67fab94b58ebb4683a76daed185 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 22 Jun 2025 11:37:21 +0200 Subject: [PATCH 098/103] signal-desktop-bin: 7.55.0 -> 7.58.0 (#413044) * signal-desktop-bin: 7.55.0 -> 7.58.0 * signal-desktop-bin(aarch64-linux): 7.55.0 -> 7.58.0 * signal-desktop-bin(darwin): 7.55.0 -> 7.58.0 * signal-desktop-bin: add commandLineArgs --- pkgs/by-name/si/signal-desktop-bin/generic.nix | 4 ++++ pkgs/by-name/si/signal-desktop-bin/package.nix | 10 +++++++--- .../si/signal-desktop-bin/signal-desktop-aarch64.nix | 10 +++++----- .../si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++-- pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix | 8 ++++---- 5 files changed, 22 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix index 978ba0ae4dfe..9b0fd4aec65c 100644 --- a/pkgs/by-name/si/signal-desktop-bin/generic.nix +++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix @@ -51,6 +51,9 @@ libpulseaudio, xdg-utils, wayland, + + # command line arguments which are always set e.g "--password-store=kwallet6" + commandLineArgs, }: { @@ -255,6 +258,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + --add-flags ${lib.escapeShellArg commandLineArgs} ) # Fix the desktop link diff --git a/pkgs/by-name/si/signal-desktop-bin/package.nix b/pkgs/by-name/si/signal-desktop-bin/package.nix index f2faec1ccb35..79e6becbe892 100644 --- a/pkgs/by-name/si/signal-desktop-bin/package.nix +++ b/pkgs/by-name/si/signal-desktop-bin/package.nix @@ -1,7 +1,11 @@ -{ stdenv, callPackage }: +{ + stdenv, + callPackage, + commandLineArgs ? "", +}: if stdenv.hostPlatform.system == "aarch64-linux" then - callPackage ./signal-desktop-aarch64.nix { } + callPackage ./signal-desktop-aarch64.nix { inherit commandLineArgs; } else if stdenv.hostPlatform.isDarwin then callPackage ./signal-desktop-darwin.nix { } else - callPackage ./signal-desktop.nix { } + callPackage ./signal-desktop.nix { inherit commandLineArgs; } diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix index 40c707422afe..1f1f5344e11f 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix @@ -1,7 +1,7 @@ -{ callPackage }: -callPackage ./generic.nix { } { +{ callPackage, commandLineArgs }: +callPackage ./generic.nix { inherit commandLineArgs; } { pname = "signal-desktop-bin"; - version = "7.55.0"; + version = "7.58.0"; libdir = "usr/lib64/signal-desktop"; bindir = "usr/bin"; @@ -10,6 +10,6 @@ callPackage ./generic.nix { } { bsdtar -xf $downloadedFile -C "$out" ''; - url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09073923-signal-desktop/signal-desktop-7.55.0-1.fc42.aarch64.rpm"; - hash = "sha256-rRt2hYyj6kyN0RCupy+hpRJuzq0aaUzP2tsVr2Qd5V4="; + url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09183198-signal-desktop/signal-desktop-7.58.0-1.fc42.aarch64.rpm"; + hash = "sha256-0Ix+1SdvmKLVbtGzbjUupvVzdWAJFNQ6sSAIt+T9fHo="; } diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix index 29140ecf699d..12d651efd925 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "signal-desktop-bin"; - version = "7.55.0"; + version = "7.58.0"; src = fetchurl { url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg"; - hash = "sha256-9PD4SDTACjKSBqIdv3CFtKhRKA5ugbQe2AcWA4hFoqs="; + hash = "sha256-yOPYG9bCSCIE1L8RgEXCy6pJUHONBh9SpPY4WDfZEho="; }; sourceRoot = "."; diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix index 31e3b0c7dc08..9bb3f231165c 100644 --- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix +++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix @@ -1,12 +1,12 @@ -{ callPackage }: -callPackage ./generic.nix { } rec { +{ callPackage, commandLineArgs }: +callPackage ./generic.nix { inherit commandLineArgs; } rec { pname = "signal-desktop-bin"; - version = "7.55.0"; + version = "7.58.0"; libdir = "opt/Signal"; bindir = libdir; extractPkg = "dpkg-deb -x $downloadedFile $out"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-uc623M/GiIfED1mTFnXUggnFdvDBmngrsdTIlq6QxqM="; + hash = "sha256-zZ63AE+qb0lrGtGUtU4FV6pHDO2DUV2vknz3a4+f4aA="; } From a412cc450a1bbeae9130ba35730ddcfbde561cd5 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Sun, 22 Jun 2025 11:46:16 +0200 Subject: [PATCH 099/103] ddnet: 19.2.1 -> 19.3 https://ddnet.org/downloads/#19.3 ddnet/ddnet@19.2.1...19.3 --- pkgs/by-name/dd/ddnet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/dd/ddnet/package.nix b/pkgs/by-name/dd/ddnet/package.nix index 5aacd3ac568e..0160e308bd06 100644 --- a/pkgs/by-name/dd/ddnet/package.nix +++ b/pkgs/by-name/dd/ddnet/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "19.2.1"; + version = "19.3"; src = fetchFromGitHub { owner = "ddnet"; repo = "ddnet"; tag = version; - hash = "sha256-0G0rVqkrIKjSGW7TF218TqakzJxiCzDipLGDzJvgdRg="; + hash = "sha256-8mCkzZPdLFGIlOkMiNDOxiQeEHa+k0BX9PMIPbjmW5k="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 51374eaa1cc0906c61635c56555624783e58ce06 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Sat, 31 May 2025 11:49:50 +0200 Subject: [PATCH 100/103] lixPackageSets.git: 2.94.0-pre-20250516_a7634f87aac5 -> 2.94.0-pre-20250621_242a228124f7 --- nixos/modules/services/system/nix-daemon.nix | 1 + pkgs/tools/package-management/lix/common-lix.nix | 1 + pkgs/tools/package-management/lix/default.nix | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index bc5bbcf06cf1..8a8b746e5544 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -230,6 +230,7 @@ in IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 1048576; Delegate = "yes"; + DelegateSubgroup = "supervisor"; }; restartTriggers = [ config.environment.etc."nix/nix.conf".source ]; diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix index df64103e8a45..9b666e5e78fb 100644 --- a/pkgs/tools/package-management/lix/common-lix.nix +++ b/pkgs/tools/package-management/lix/common-lix.nix @@ -139,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: { p.pytest p.pytest-xdist p.python-frontmatter + p.toml ])) pkg-config flex diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 28f368731118..c6d905d78048 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -234,14 +234,14 @@ lib.makeExtensible (self: { attrName = "git"; lix-args = rec { - version = "2.94.0-pre-20250516_${builtins.substring 0 12 src.rev}"; + version = "2.94.0-pre-20250621_${builtins.substring 0 12 src.rev}"; src = fetchFromGitea { domain = "git.lix.systems"; owner = "lix-project"; repo = "lix"; - rev = "a7634f87aac545fa01fa19878cc5ad2c994e2116"; - hash = "sha256-+yX+xF1cZUd1Pub7MJ7uGcC6JQ0FN+CsEmBg6rGLfjU="; + rev = "242a228124f77b57c2e3b3aedb259ffb7913cd3c"; + hash = "sha256-hCbhc9P+UmIlYv81+vs6v3bDqviCUhwPH3XqClZdfSk="; }; cargoDeps = rustPlatform.fetchCargoVendor { From a2e1f82167a613134a7e24d461595f3a8b90d402 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 20 Jun 2025 19:01:33 +0000 Subject: [PATCH 101/103] perl540: fix cross compilation --- .../interpreters/perl/cross-fdopendir.patch | 21 +++++++++++++++++++ .../interpreters/perl/interpreter.nix | 9 ++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/interpreters/perl/cross-fdopendir.patch diff --git a/pkgs/development/interpreters/perl/cross-fdopendir.patch b/pkgs/development/interpreters/perl/cross-fdopendir.patch new file mode 100644 index 000000000000..f46d23006b4c --- /dev/null +++ b/pkgs/development/interpreters/perl/cross-fdopendir.patch @@ -0,0 +1,21 @@ +From f702c387e6940fab3801d7562a668b974a2b3a8f Mon Sep 17 00:00:00 2001 +From: Audrey Dutcher +Date: Fri, 30 May 2025 12:29:54 -0700 +Subject: [PATCH] add d_fdopendir configuration + +--- + cnf/configure_func.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/cnf/configure_func.sh b/cnf/configure_func.sh +index 4c13e4c..b24fe03 100644 +--- a/cnf/configure_func.sh ++++ b/cnf/configure_func.sh +@@ -83,6 +83,7 @@ checkfunc d_fchmodat 'fchmodat' "0,NULL,0,0" 'unistd.h sys/stat.h' + checkfunc d_fchown 'fchown' "0,0,0" 'unistd.h' + checkfunc d_fcntl 'fcntl' "0,0" 'unistd.h fcntl.h' + checkfunc d_fdclose 'fdclose' "NULL,NULL" 'stdio.h' ++checkfunc d_fdopendir 'fdopendir' "0" 'dirent.h' + checkfunc d_ffs 'ffs' "0" 'strings.h' + checkfunc d_ffsl 'ffsl' "0" 'strings.h' + checkfunc d_fgetpos 'fgetpos' "NULL, 0" 'stdio.h' diff --git a/pkgs/development/interpreters/perl/interpreter.nix b/pkgs/development/interpreters/perl/interpreter.nix index dbeb4fa69d85..57306ce6d551 100644 --- a/pkgs/development/interpreters/perl/interpreter.nix +++ b/pkgs/development/interpreters/perl/interpreter.nix @@ -317,15 +317,20 @@ stdenv.mkDerivation ( }; } // lib.optionalAttrs crossCompiling rec { - crossVersion = "1.6"; + crossVersion = "1.6.2"; perl-cross-src = fetchFromGitHub { name = "perl-cross-${crossVersion}"; owner = "arsv"; repo = "perl-cross"; rev = crossVersion; - sha256 = "sha256-TVDLxw8ctl64LSfLfB4/WLYlSTO31GssSzmdVfqkBmg="; + hash = "sha256-mG9ny+eXGBL4K/rXqEUPSbar+4Mq4IaQrGRFIHIyAAw="; }; + patches = [ + # fixes build failure due to missing d_fdopendir/HAS_FDOPENDIR configure option + # https://github.com/arsv/perl-cross/pull/159 + ./cross-fdopendir.patch + ]; depsBuildBuild = [ buildPackages.stdenv.cc From 864ddfc5c6cd7858c66d77429d5a466b70073400 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 22 Jun 2025 12:27:15 +0200 Subject: [PATCH 102/103] python3Packages.djangocms-alias: Update changelog url --- pkgs/development/python-modules/djangocms-alias/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix index 44d1c027b75e..e6b1fc9815ca 100644 --- a/pkgs/development/python-modules/djangocms-alias/default.nix +++ b/pkgs/development/python-modules/djangocms-alias/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Lean enterprise content management powered by Django"; homepage = "https://django-cms.org"; - changelog = "https://github.com/django-cms/django-cms/releases/tag/${src.tag}"; + changelog = "https://github.com/django-cms/djangocms-alias/releases/tag/${src.tag}"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.onny ]; }; From 7c796b5affe4f5803be92fa3bbaad1a676bbe7f1 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sat, 10 May 2025 14:34:32 +0900 Subject: [PATCH 103/103] passt: 2025_05_03.587980c -> 2025_06_11.0293c6f Signed-off-by: misilelab --- pkgs/by-name/pa/passt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix index a8af2a7fe952..c8011032f30d 100644 --- a/pkgs/by-name/pa/passt/package.nix +++ b/pkgs/by-name/pa/passt/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "passt"; - version = "2025_05_03.587980c"; + version = "2025_06_11.0293c6f"; src = fetchurl { url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz"; - hash = "sha256-ussvShWxhR6ScBYiCJG0edrqS+W+74DSlsDRS1GCByA="; + hash = "sha256-ovkFQlUa5gLYwCpNjwfGVJ055aDKCXIZou/t4pf6q5o="; }; separateDebugInfo = true;