From 8c0e76ad140678fadb61bf566cb013f48744014a Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 3 Sep 2024 13:27:37 -0400 Subject: [PATCH 1/3] gdlv: Reformat with official formatter --- pkgs/development/tools/gdlv/default.nix | 33 +++++++++++++++---------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/development/tools/gdlv/default.nix index 0d2cc49c9e02..ec4fa5b35255 100644 --- a/pkgs/development/tools/gdlv/default.nix +++ b/pkgs/development/tools/gdlv/default.nix @@ -1,13 +1,13 @@ -{ lib -, stdenv -, buildGoModule -, fetchFromGitHub -, Foundation -, CoreGraphics -, Metal -, AppKit +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + Foundation, + CoreGraphics, + Metal, + AppKit, }: - buildGoModule rec { pname = "gdlv"; version = "1.10.0"; @@ -19,15 +19,22 @@ buildGoModule rec { hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI="; }; - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' - export MACOSX_DEPLOYMENT_TARGET=10.15 - ''; + preBuild = + lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") + '' + export MACOSX_DEPLOYMENT_TARGET=10.15 + ''; vendorHash = null; subPackages = "."; - buildInputs = lib.optionals stdenv.isDarwin [ Foundation CoreGraphics Metal AppKit ]; + buildInputs = lib.optionals stdenv.isDarwin [ + Foundation + CoreGraphics + Metal + AppKit + ]; meta = with lib; { description = "GUI frontend for Delve"; From 3c841d740f9add1e89bb16d2a249cbf8c0b5a40e Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 3 Sep 2024 14:06:13 -0400 Subject: [PATCH 2/3] gdlv: Convert to by-name --- .../gdlv/default.nix => by-name/gd/gdlv/package.nix} | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/{development/tools/gdlv/default.nix => by-name/gd/gdlv/package.nix} (100%) diff --git a/pkgs/development/tools/gdlv/default.nix b/pkgs/by-name/gd/gdlv/package.nix similarity index 100% rename from pkgs/development/tools/gdlv/default.nix rename to pkgs/by-name/gd/gdlv/package.nix index ec4fa5b35255..7fdd6c7f796b 100644 --- a/pkgs/development/tools/gdlv/default.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -3,10 +3,10 @@ stdenv, buildGoModule, fetchFromGitHub, - Foundation, - CoreGraphics, - Metal, AppKit, + CoreGraphics, + Foundation, + Metal, }: buildGoModule rec { pname = "gdlv"; @@ -30,10 +30,10 @@ buildGoModule rec { subPackages = "."; buildInputs = lib.optionals stdenv.isDarwin [ - Foundation - CoreGraphics - Metal AppKit + CoreGraphics + Foundation + Metal ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab46f6533c89..5b4a7636730e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26724,8 +26724,8 @@ with pkgs; ginkgo = callPackage ../development/tools/ginkgo { }; - gdlv = darwin.apple_sdk_11_0.callPackage ../development/tools/gdlv { - inherit (darwin.apple_sdk_11_0.frameworks) Foundation CoreGraphics Metal AppKit; + gdlv = callPackage ../by-name/gd/gdlv/package.nix { + inherit (darwin.apple_sdk_11_0.frameworks) AppKit CoreGraphics Foundation Metal; }; go-bindata = callPackage ../development/tools/go-bindata { }; From 251fcfba615529b2946e17fd1e68746f5245b74e Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 3 Sep 2024 14:09:52 -0400 Subject: [PATCH 3/3] gdlv: Update 1.10.0 -> 1.12.0 2024-03-04 / Version 1.12 Function names in the stacktrace window is shortened by default Add next-instruction command Make the text in the variables window selectable Miscellaneous bug fixes 2023-09-24 / Version 1.11 Better display of suspended breakpoints Add libraries command When printing a channel also print a list of goroutines waiting on it --- pkgs/by-name/gd/gdlv/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gd/gdlv/package.nix b/pkgs/by-name/gd/gdlv/package.nix index 7fdd6c7f796b..27628ae34d6b 100644 --- a/pkgs/by-name/gd/gdlv/package.nix +++ b/pkgs/by-name/gd/gdlv/package.nix @@ -10,25 +10,24 @@ }: buildGoModule rec { pname = "gdlv"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "aarzilli"; repo = "gdlv"; rev = "v${version}"; - hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI="; + hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ="; }; + vendorHash = null; + subPackages = "."; + preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0") '' export MACOSX_DEPLOYMENT_TARGET=10.15 ''; - vendorHash = null; - - subPackages = "."; - buildInputs = lib.optionals stdenv.isDarwin [ AppKit CoreGraphics