From 99fa438dbffa52dec61baa960e5143b102b342ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sat, 21 Dec 2024 07:40:33 +0100 Subject: [PATCH 1/2] maintainers/team-list: remove ncfavier from haskell --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4d7eca3e48cb..92699be51581 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -478,7 +478,6 @@ with lib.maintainers; members = [ cdepillabout maralorn - ncfavier sternenseemann ]; githubTeams = [ "haskell" ]; From 6a590ecb44a59ffc2e3f807ba90876f7c2720ce4 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Dec 2024 10:23:39 +0300 Subject: [PATCH 2/2] kdePackages.drkonqi: fix overzealous replacement I went full find and replace. Never go full find and replace. --- pkgs/kde/plasma/drkonqi/gdb-path.patch | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/kde/plasma/drkonqi/gdb-path.patch b/pkgs/kde/plasma/drkonqi/gdb-path.patch index c4bf303e7ee7..620a0c9ce9d1 100644 --- a/pkgs/kde/plasma/drkonqi/gdb-path.patch +++ b/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::availableInternalDebuggers(const QString &backend) +@@ -36,12 +36,12 @@ QList Debugger::availableInternalDebuggers(const QString &backend) result.push_back(std::make_shared( 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::availableInternalDebuggers(const QString &backend) + u"gdb"_s, +@@ -63,12 +63,12 @@ QList 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,