Skip to content

Commit 5d8de5b

Browse files
Merge master into staging-next
2 parents 3b9c113 + fe1376b commit 5d8de5b

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

maintainers/team-list.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,6 @@ with lib.maintainers;
478478
members = [
479479
cdepillabout
480480
maralorn
481-
ncfavier
482481
sternenseemann
483482
];
484483
githubTeams = [ "haskell" ];

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/src/debugger.cpp b/src/debugger.cpp
2-
index 946bdd12..afb69e35 100644
2+
index 946bdd12..5c24b371 100644
33
--- a/src/debugger.cpp
44
+++ b/src/debugger.cpp
5-
@@ -36,15 +36,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
5+
@@ -36,12 +36,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
66
result.push_back(std::make_shared<Data>(
77
Data{.displayName = i18nc("@label the debugger called GDB", "GDB"),
88
.codeName = u"gdb"_s,
@@ -17,12 +17,8 @@ index 946bdd12..afb69e35 100644
1717
+ u"@gdb@ -nw -n -batch --init-eval-command='set debuginfod enabled on' -x %preamblefile -x %tempfile -p %pid %execpath"_s,
1818
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
1919
.preambleCommands = expandCommand(
20-
- u"gdb"_s,
21-
+ u"@gdb@"_s,
22-
u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
23-
.execInputFile = {}}}));
24-
25-
@@ -63,15 +63,15 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
20+
u"gdb"_s,
21+
@@ -63,12 +63,12 @@ QList<Debugger> Debugger::availableInternalDebuggers(const QString &backend)
2622
Data{
2723
.displayName = i18nc("@label the debugger called GDB", "GDB"),
2824
.codeName = u"gdb"_s,
@@ -37,8 +33,4 @@ index 946bdd12..afb69e35 100644
3733
+ u"@gdb@ --nw --nx --batch --init-eval-command='set debuginfod enabled on' --command=%preamblefile --command=%tempfile --core=%corefile %execpath"_s,
3834
.backtraceBatchCommands = u"thread\nthread apply all bt"_s,
3935
.preambleCommands = expandCommand(
40-
- u"gdb"_s,
41-
+ u"@gdb@"_s,
42-
u"set width 200\nset backtrace limit 128\nsource %drkonqi_datadir/python/gdb_preamble/preamble.py\npy print_preamble()"_s),
43-
.execInputFile = {}}}));
44-
}
36+
u"gdb"_s,

0 commit comments

Comments
 (0)