Merge master into staging-next

maintainers/team-list.nix

@@ -478,7 +478,6 @@ with lib.maintainers;
     members = [
       cdepillabout
       maralorn
-      ncfavier
       sternenseemann
     ];
     githubTeams = [ "haskell" ];

pkgs/kde/plasma/drkonqi/gdb-path.patch

@@ -1,8 +1,8 @@
 diff --git a/src/debugger.cpp b/src/debugger.cpp
-index 946bdd12..afb69e35 100644
+index 946bdd12..5c24b371 100644
 --- a/src/debugger.cpp
 +++ b/src/debugger.cpp
-@@ -36,15 +36,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
+@@ -36,12 +36,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
          result.push_back(std::make_shared<Data>(
              Data{.displayName = i18nc("@label the debugger called GDB", "GDB"),
                   .codeName = u"gdb"_s,
@@ -17,12 +17,8 @@ index 946bdd12..afb69e35 100644
 +                                     u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
                                   .backtraceBatchCommands = u"thread\nthread apply all bt"_s,
                                   .preambleCommands = expandCommand(
--                                     u"gdb"_s,
-+                                     u"@gdb@"_s,
-                                      u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
-                                  .execInputFile = {}}}));
- 
-@@ -63,15 +63,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
+                                      u"gdb"_s,
+@@ -63,12 +63,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
              Data{
                  .displayName = i18nc("@label the debugger called GDB", "GDB"),
                  .codeName = u"gdb"_s,
@@ -37,8 +33,4 @@ index 946bdd12..afb69e35 100644
 +                        u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
                      .backtraceBatchCommands = u"thread\nthread apply all bt"_s,
                      .preambleCommands = expandCommand(
--                        u"gdb"_s,
-+                        u"@gdb@"_s,
-                         u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
-                     .execInputFile = {}}}));
-     }
+                         u"gdb"_s,