diff --git a/flake.lock b/flake.lock index 4130956b..d285dc6e 100644 --- a/flake.lock +++ b/flake.lock @@ -184,11 +184,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752683762, - "narHash": "sha256-CVC4bpthYhKk4Qb4mt00SqfJ7CJ4vfTX06pLN2OHa1c=", + "lastModified": 1768364046, + "narHash": "sha256-PDFfpswLiuG/DcadTBb7dEfO3jX1fcGlCD4ZKSkC0M8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa64ec5c1ca6f17746f3defedb988b9248e97616", + "rev": "ea30586ee015f37f38783006a9bc9e4aa64d7d61", "type": "github" }, "original": { diff --git a/pkgs/dap-cpp/default.nix b/pkgs/dap-cpp/default.nix deleted file mode 100644 index 2f329364..00000000 --- a/pkgs/dap-cpp/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ pkgs, stdenv, fetchurl, bash, coreutils, unzip }: - -stdenv.mkDerivation rec { - pname = "vscode-cpptools-dap"; - version = "1.3.1"; - - phases = "installPhase fixupPhase"; - - src = fetchurl { - url = "https://github.com/microsoft/vscode-cpptools/releases/download/${version}/cpptools-linux.vsix"; - sha256 = "e88008c3d1a19e2b65152b39b94a792b451fad99e51da59f0500e6efd2ccc168"; - }; - - # TODO: this has an implicit dependency on gdb. - - buildInputs = [ bash coreutils unzip ]; - - installPhase = '' - mkdir -p $out/share/dap/cpp $out/bin - ${unzip}/bin/unzip -q ${src} -d $out/share/dap/cpp - chmod +x $out/share/dap/cpp/extension/debugAdapters/OpenDebugAD7 $out/share/dap/cpp/extension/debugAdapters/mono.linux-x86_64 - - # OpenDebugAD7 doesn't quite like being called through a symlink, since it - # does some path manipulation based on $0. Create a tiny wrapper shell script - # for it. - cat< $out/bin/dap-cpp - #!${stdenv.shell} - export PATH="${pkgs.lib.makeBinPath [pkgs.gdb pkgs.coreutils]}" - exec $out/share/dap/cpp/extension/debugAdapters/OpenDebugAD7 "\$@" - EOF - chmod +x $out/bin/dap-cpp - ''; -} diff --git a/pkgs/dap-cpp/messages.nix b/pkgs/dap-cpp/messages.nix deleted file mode 100644 index 9053fc2d..00000000 --- a/pkgs/dap-cpp/messages.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - dapInitializeMessage = { - command = "initialize"; - type = "request"; - arguments = { - adapterID = "cppdbg"; - clientID = "replit"; - clientName = "replit.com"; - columnsStartAt1 = true; - linesStartAt1 = true; - locale = "en-us"; - pathFormat = "path"; - supportsInvalidatedEvent = true; - supportsProgressReporting = true; - supportsRunInTerminalRequest = true; - supportsVariablePaging = true; - supportsVariableType = true; - }; - }; - - dapLaunchMessage = program: { - command = "launch"; - type = "request"; - arguments = { - MIMode = "gdb"; - arg = [ ]; - cwd = "."; - environment = [ ]; - externalConsole = false; - logging = { }; - miDebuggerPath = "gdb"; - name = "gcc - Build and debug active file"; - inherit program; - request = "launch"; - setupCommands = [ - { - description = "Enable pretty-printing for gdb"; - ignoreFailures = true; - text = "-enable-pretty-printing"; - } - ]; - stopAtEntry = false; - type = "cppdbg"; - }; - }; -} diff --git a/pkgs/dapPython/default.nix b/pkgs/dapPython/default.nix deleted file mode 100644 index 21efdbbc..00000000 --- a/pkgs/dapPython/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, python, pypkgs, debugpy ? pypkgs.debugpy }: - -let - pythonVersion = pkgs.lib.versions.majorMinor python.version; -in -pkgs.stdenv.mkDerivation { - name = "dap-python"; - version = debugpy.version; - propagatedBuildInputs = [ - (python.withPackages (_: [ - debugpy - ])) - ]; - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - cp ${./wrapper.py} $out/bin/dap-python - chmod +x $out/bin/dap-python - - substituteInPlace $out/bin/dap-python \ - --replace "@python-bin@" "${python}/bin/python3" \ - --replace "@debugpy-path@" "${debugpy.out}/lib/python${pythonVersion}/site-packages" - ''; -} diff --git a/pkgs/dapPython/wrapper.py b/pkgs/dapPython/wrapper.py deleted file mode 100644 index 11f2f00b..00000000 --- a/pkgs/dapPython/wrapper.py +++ /dev/null @@ -1,46 +0,0 @@ -#!@python-bin@ -"""A small wrapper around debugpy's cli. - -This wrapper is roughly equivalent to: - - python3 -m debugpy --listen localhost:0 --wait-for-client "$@" - -with the added twist that it reports the port used back through fd 3. -""" - -import os -import os.path -import sys -import runpy - -# Permit interpolated path to be sensibly replaced. -for idx, path in enumerate("@debugpy-path@".split(":")): - sys.path.insert(idx, path) - -import debugpy -import debugpy.server - - -def _main() -> None: - if len(sys.argv) < 2: - print(f'Usage: {sys.argv[0]}