[pull] master from NixOS:master

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -267,6 +267,21 @@
 
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
+- Caddy can now be built with plugins by using `caddy.withPlugins`, a `passthru` function that accepts an attribute set as a parameter. The `plugins` argument represents a list of Caddy plugins, with each Caddy plugin being a versioned module. The `hash` argument represents the `vendorHash` of the resulting Caddy source code with the plugins added.
+
+  Example:
+  ```nix
+  services.caddy = {
+    enable = true;
+    package = pkgs.caddy.withPlugins {
+      plugins = [ "github.com/caddy-dns/[email protected]" ];
+      hash = "sha256-F/jqR4iEsklJFycTjSaW8B/V3iTGqqGOzwYBUXxRKrc=";
+    };
+  };
+  ```
+
+  To get the necessary hash of the vendored dependencies, omit `hash`. The build will fail and tell you the correct value.
+
 - `programs.fzf.keybindings` now supports the fish shell.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

nixos/modules/hardware/wooting.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 {
-  options.hardware.wooting.enable = lib.mkEnableOption ''support for Wooting keyboards.
-    Note that users must be in the "input" group for udev rules to apply'';
+  options.hardware.wooting.enable = lib.mkEnableOption "support for Wooting keyboards";
 
   config = lib.mkIf config.hardware.wooting.enable {
     environment.systemPackages = [ pkgs.wootility ];

nixos/modules/services/mail/opensmtpd.nix

@@ -114,7 +114,11 @@ in
     };
 
     services.mail.sendmailSetuidWrapper = lib.mkIf cfg.setSendmail (
-      security.wrappers.smtpctl // { program = "sendmail"; }
+      security.wrappers.smtpctl
+      // {
+        source = "${sendmail}/bin/sendmail";
+        program = "sendmail";
+      }
     );
 
     systemd.tmpfiles.rules = [

nixos/tests/opensmtpd-rspamd.nix

@@ -29,12 +29,8 @@ import ./make-test-python.nix {
               "${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
             match from any for local action dovecot_deliver
 
-            action do_relay relay
-            # DO NOT DO THIS IN PRODUCTION!
-            # Setting up authentication requires a certificate which is painful in
-            # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
-            # WELL-CONTROLLED ENVIRONMENT!
-            match from any for any action do_relay
+            action relay_smtp2 relay host "smtp://192.168.1.2"
+            match from any for any action relay_smtp2
           '';
         };
         services.dovecot2 = {
@@ -107,7 +103,7 @@ import ./make-test-python.nix {
               import smtplib, sys
 
               with smtplib.SMTP('192.168.1.1') as smtp:
-                smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """
+                smtp.sendmail('alice@smtp1', 'bob@smtp2', """
                   From: alice@smtp1
                   To: bob@smtp2
                   Subject: Test

nixos/tests/opensmtpd.nix

@@ -16,18 +16,33 @@ import ./make-test-python.nix {
             }
           ];
         };
-        environment.systemPackages = [ pkgs.opensmtpd ];
+        environment.systemPackages =
+          let
+            testSendmail = pkgs.writeScriptBin "test-sendmail" ''
+              #!/bin/sh
+              set -euxo pipefail
+              echo "========= SENDING" >&2
+              ${pkgs.system-sendmail}/bin/sendmail -v -f alice@smtp1 bob@smtp2 >&2 <<EOF
+              From: alice@smtp1
+              To: bob@smtp2
+              Subject: Sendmail Test
+
+              Hello World
+              EOF
+              echo "=========== FINISHED SENDING" >&2
+            '';
+          in
+          [
+            pkgs.opensmtpd
+            testSendmail
+          ];
         services.opensmtpd = {
           enable = true;
           extraServerArgs = [ "-v" ];
           serverConfiguration = ''
             listen on 0.0.0.0
-            action do_relay relay
-            # DO NOT DO THIS IN PRODUCTION!
-            # Setting up authentication requires a certificate which is painful in
-            # a test environment, but THIS WOULD BE DANGEROUS OUTSIDE OF A
-            # WELL-CONTROLLED ENVIRONMENT!
-            match from any for any action do_relay
+            action relay_smtp2 relay host "smtp://192.168.1.2"
+            match from any for any action relay_smtp2
           '';
         };
       };
@@ -87,7 +102,7 @@ import ./make-test-python.nix {
               import smtplib, sys
 
               with smtplib.SMTP('192.168.1.1') as smtp:
-                smtp.sendmail('alice@[192.168.1.1]', 'bob@[192.168.1.2]', """
+                smtp.sendmail('alice@smtp1', 'bob@smtp2', """
                   From: alice@smtp1
                   To: bob@smtp2
                   Subject: Test
@@ -105,16 +120,19 @@ import ./make-test-python.nix {
                 imap.select()
                 status, refs = imap.search(None, 'ALL')
                 assert status == 'OK'
-                assert len(refs) == 1
-                status, msg = imap.fetch(refs[0], 'BODY[TEXT]')
+                assert len(refs) == 1 and refs[0] != ""
+                status, msg = imap.fetch(refs[0], '(BODY[TEXT])')
                 assert status == 'OK'
                 content = msg[0][1]
                 print("===> content:", content)
                 split = content.split(b'\r\n')
                 print("===> split:", split)
-                lastline = split[-3]
+                split.reverse()
+                lastline = next(filter(lambda x: x != b"", map(bytes.strip, split)))
                 print("===> lastline:", lastline)
                 assert lastline.strip() == b'Hello World'
+                imap.store(refs[0], '+FLAGS', '\\Deleted')
+                imap.expunge()
             '';
           in
           [
@@ -143,6 +161,11 @@ import ./make-test-python.nix {
     smtp1.wait_until_fails("smtpctl show queue | egrep .")
     smtp2.wait_until_fails("smtpctl show queue | egrep .")
     client.succeed("check-mail-landed >&2")
+
+    smtp1.succeed("test-sendmail")
+    smtp1.wait_until_fails("smtpctl show queue | egrep .")
+    smtp2.wait_until_fails("smtpctl show queue | egrep .")
+    client.succeed("check-mail-landed >&2")
   '';
 
   meta.timeout = 1800;

pkgs/applications/audio/plexamp/default.nix

@@ -7,12 +7,12 @@
 
 let
   pname = "plexamp";
-  version = "4.11.2";
+  version = "4.11.5";
 
   src = fetchurl {
     url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    hash = "sha512-cNBupLFHhq7GDoj/QYGsS0UShTKmDpf/JxBZS92VwTCuuBjScTMGF0cETGEYYnvxqv4vf9MSKNY0/HW9CuguaA==";
+    hash = "sha512-j8fPp6JcTB/PwsGgvEGqETZ83mGee1MwR4T9eFcNuoLRtlnudM7c3WDgxhpUdv5Nx3XkcMVnW1fntZYN2sIfzA==";
   };
 
   appimageContents = appimageTools.extractType2 {
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
   meta = with lib; {
     description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
     homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/76";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/77";
     license = licenses.unfree;
     maintainers = with maintainers; [
       killercup

pkgs/applications/editors/cudatext/default.nix

@@ -17,8 +17,7 @@
 , python3
 
 # Qt5
-, libqt5pas
-, qt5
+, libsForQt5
 
 , widgetset ? "qt5"
 # See https://github.com/Alexey-T/CudaText-lexers
@@ -59,13 +58,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ lazarus fpc ]
-    ++ lib.optional (widgetset == "qt5") qt5.wrapQtAppsHook;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook;
 
   buildInputs = [ libX11 ]
     ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ pango cairo glib atk gdk-pixbuf ]
     ++ lib.optional (widgetset == "gtk2") gtk2
     ++ lib.optional (widgetset == "gtk3") gtk3
-    ++ lib.optional (widgetset == "qt5") libqt5pas;
+    ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas;
 
   NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
 

pkgs/applications/editors/vim/plugins/generated.nix

@@ -749,6 +749,30 @@ final: prev:
     meta.homepage = "https://github.com/otavioschwanck/arrow.nvim/";
   };
 
+  astrocore = buildVimPlugin {
+    pname = "astrocore";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrocore";
+      rev = "ecaf7c76484d3313b966856c2c29672a6abbc3f4";
+      sha256 = "1n9akfpm7lmby20w2dmh99vspff8hack81f6d0as531yjjflbcy0";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrocore/";
+  };
+
+  astrolsp = buildVimPlugin {
+    pname = "astrolsp";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astrolsp";
+      rev = "e5e88e2b5ed1c0f8b6fbea682577473aeabdc2b4";
+      sha256 = "0arf7lmmcniq1ppsa9544x240simw38m72fm4i0100r05p0h4ygk";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astrolsp/";
+  };
+
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
     version = "2024-12-10";
@@ -761,6 +785,18 @@ final: prev:
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
 
+  astroui = buildVimPlugin {
+    pname = "astroui";
+    version = "2024-12-23";
+    src = fetchFromGitHub {
+      owner = "AstroNvim";
+      repo = "astroui";
+      rev = "81ddd0315ac4b260a4563a00be943992901ae5e5";
+      sha256 = "1qv9ny98wxyjdyzsw5gmn4wfsklrl01m27hxaba0mypirjr0kv1r";
+    };
+    meta.homepage = "https://github.com/AstroNvim/astroui/";
+  };
+
   async-vim = buildVimPlugin {
     pname = "async.vim";
     version = "2022-04-04";
@@ -6507,6 +6543,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
 
+  mason-null-ls-nvim = buildVimPlugin {
+    pname = "mason-null-ls.nvim";
+    version = "2024-04-09";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-null-ls.nvim";
+      rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
+      sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
+  };
+
   mason-nvim = buildVimPlugin {
     pname = "mason.nvim";
     version = "2024-07-16";
@@ -6519,6 +6567,18 @@ final: prev:
     meta.homepage = "https://github.com/williamboman/mason.nvim/";
   };
 
+  mason-nvim-dap-nvim = buildVimPlugin {
+    pname = "mason-nvim-dap.nvim";
+    version = "2024-08-04";
+    src = fetchFromGitHub {
+      owner = "jay-babu";
+      repo = "mason-nvim-dap.nvim";
+      rev = "8b9363d83b5d779813cdd2819b8308651cec2a09";
+      sha256 = "0q2pk217lrnpyvqj0mqikayyiajdvj3apki66mxx27zibgc7qg3l";
+    };
+    meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
+  };
+
   mason-tool-installer-nvim = buildVimPlugin {
     pname = "mason-tool-installer.nvim";
     version = "2024-06-03";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -143,10 +143,23 @@ in
     nvimRequireCheck = "advanced_git_search.utils";
   };
 
+  astrocore = super.astrocore.overrideAttrs {
+    dependencies = [ self.lazy-nvim ];
+  };
+
   astrotheme = super.astrotheme.overrideAttrs {
-    nvimRequireCheck = "astrotheme";
+    nvimSkipModule = [
+      # attempt to index local 'c' (a nil value)
+      "astrotheme.groups.plugins.flash"
+      "astrotheme.groups.plugins.todo-comments"
+    ];
   };
 
+  astroui = super.astroui.overrideAttrs (oa: {
+    # Readme states that astrocore is an optional dependency
+    nativeCheckInputs = oa.nativeCheckInputs ++ [ self.astrocore ];
+  });
+
   asyncrun-vim = super.asyncrun-vim.overrideAttrs {
     nvimSkipModule = [
       # vim plugin with optional toggleterm integration
@@ -1556,6 +1569,20 @@ in
     nvimRequireCheck = "mason-lspconfig";
   };
 
+  mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      null-ls-nvim
+    ];
+  };
+
+  mason-nvim-dap-nvim = super.mason-nvim-dap-nvim.overrideAttrs {
+    dependencies = with self; [
+      mason-nvim
+      nvim-dap
+    ];
+  };
+
   mason-nvim = super.mason-nvim.overrideAttrs {
     # lua/mason-vendor/zzlib/inflate-bwo.lua:15: 'end' expected near '&'
     nvimSkipModule = "mason-vendor.zzlib.inflate-bwo";
@@ -2345,7 +2372,7 @@ in
       openscad
     ];
 
-    # FIXME: cant find plugin root dir
+    # FIXME: can't find plugin root dir
     nvimSkipModule = [
       "openscad"
       "openscad.snippets.openscad"

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -61,7 +61,10 @@ https://github.com/ckarnell/antonys-macro-repeater/,,
 https://github.com/solarnz/arcanist.vim/,,
 https://github.com/vim-scripts/argtextobj.vim/,,
 https://github.com/otavioschwanck/arrow.nvim/,,
+https://github.com/AstroNvim/astrocore/,HEAD,
+https://github.com/AstroNvim/astrolsp/,HEAD,
 https://github.com/AstroNvim/astrotheme/,,
+https://github.com/AstroNvim/astroui/,HEAD,
 https://github.com/prabirshrestha/async.vim/,,
 https://github.com/prabirshrestha/asyncomplete-buffer.vim/,HEAD,
 https://github.com/prabirshrestha/asyncomplete-file.vim/,HEAD,
@@ -539,6 +542,8 @@ https://github.com/David-Kunz/markid/,HEAD,
 https://github.com/chentoast/marks.nvim/,,
 https://github.com/OXY2DEV/markview.nvim/,HEAD,
 https://github.com/williamboman/mason-lspconfig.nvim/,HEAD,
+https://github.com/jay-babu/mason-null-ls.nvim/,HEAD,
+https://github.com/jay-babu/mason-nvim-dap.nvim/,HEAD,
 https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/,HEAD,
 https://github.com/williamboman/mason.nvim/,HEAD,
 https://github.com/vim-scripts/matchit.zip/,,