From 1ccd7953fbb0759180b0f9063c8328b0de1feafa Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 12 Dec 2025 10:04:39 +0200 Subject: [PATCH] gdb: migrate to by-name --- .../tools/misc => by-name/gd}/gdb/darwin-target-match.patch | 0 .../tools/misc => by-name/gd}/gdb/debug-info-from-env.patch | 0 .../tools/misc/gdb/default.nix => by-name/gd/gdb/package.nix} | 2 -- pkgs/top-level/all-packages.nix | 4 ---- 4 files changed, 6 deletions(-) rename pkgs/{development/tools/misc => by-name/gd}/gdb/darwin-target-match.patch (100%) rename pkgs/{development/tools/misc => by-name/gd}/gdb/debug-info-from-env.patch (100%) rename pkgs/{development/tools/misc/gdb/default.nix => by-name/gd/gdb/package.nix} (99%) diff --git a/pkgs/development/tools/misc/gdb/darwin-target-match.patch b/pkgs/by-name/gd/gdb/darwin-target-match.patch similarity index 100% rename from pkgs/development/tools/misc/gdb/darwin-target-match.patch rename to pkgs/by-name/gd/gdb/darwin-target-match.patch diff --git a/pkgs/development/tools/misc/gdb/debug-info-from-env.patch b/pkgs/by-name/gd/gdb/debug-info-from-env.patch similarity index 100% rename from pkgs/development/tools/misc/gdb/debug-info-from-env.patch rename to pkgs/by-name/gd/gdb/debug-info-from-env.patch diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/by-name/gd/gdb/package.nix similarity index 99% rename from pkgs/development/tools/misc/gdb/default.nix rename to pkgs/by-name/gd/gdb/package.nix index 82d33bfbc4ce..531f908db504 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/by-name/gd/gdb/package.nix @@ -29,7 +29,6 @@ python3, enableDebuginfod ? lib.meta.availableOn stdenv.hostPlatform elfutils, elfutils, - guile ? null, hostCpuOnly ? false, enableSim ? false, safePaths ? [ @@ -94,7 +93,6 @@ stdenv.mkDerivation rec { zlib zstd xz - guile sourceHighlight ] ++ lib.optional pythonSupport python3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b4a03b9e304..6bcae123e1a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6539,10 +6539,6 @@ with pkgs; enablePythonApi = false; }; - gdb = callPackage ../development/tools/misc/gdb { - guile = null; - }; - gdbHostCpuOnly = gdb.override { hostCpuOnly = true; }; valgrind-light = (valgrind.override { gdb = null; }).overrideAttrs (oldAttrs: {