gdlv: 1.10.0 -> 1.12.0 + misc stuff (#339313)

pkgs/by-name/gd/gdlv/package.nix

@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  AppKit,
+  CoreGraphics,
+  Foundation,
+  Metal,
+}:
+buildGoModule rec {
+  pname = "gdlv";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "aarzilli";
+    repo = "gdlv";
+    rev = "v${version}";
+    hash = "sha256-6NU7bhURdXM4EjVnsXVf9XFOUgHyVEI0kr15q9OnUTQ=";
+  };
+
+  vendorHash = null;
+  subPackages = ".";
+
+  preBuild =
+    lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11.0")
+      ''
+        export MACOSX_DEPLOYMENT_TARGET=10.15
+      '';
+
+  buildInputs = lib.optionals stdenv.isDarwin [
+    AppKit
+    CoreGraphics
+    Foundation
+    Metal
+  ];
+
+  meta = with lib; {
+    description = "GUI frontend for Delve";
+    mainProgram = "gdlv";
+    homepage = "https://github.com/aarzilli/gdlv";
+    maintainers = with maintainers; [ mmlb ];
+    license = licenses.gpl3;
+  };
+}

pkgs/development/tools/gdlv/default.nix

@@ -1,39 +0,0 @@
-{ lib
-, stdenv
-, buildGoModule
-, fetchFromGitHub
-, Foundation
-, CoreGraphics
-, Metal
-, AppKit
-}:
-
-buildGoModule rec {
-  pname = "gdlv";
-  version = "1.10.0";
-
-  src = fetchFromGitHub {
-    owner = "aarzilli";
-    repo = "gdlv";
-    rev = "v${version}";
-    hash = "sha256-OPsQOFwV6jIX4ZOVwJmpTeQUr/zkfkqCr86HmPhYarI=";
-  };
-
-  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 ];
-
-  meta = with lib; {
-    description = "GUI frontend for Delve";
-    mainProgram = "gdlv";
-    homepage = "https://github.com/aarzilli/gdlv";
-    maintainers = with maintainers; [ mmlb ];
-    license = licenses.gpl3;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -26699,8 +26699,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 { };