Merge pull request #318798 from msanft/vndr/build-go-module

vndr: migrate to buildGoModule

3 files changed, 33 insertions, 27 deletions

diff --git a/pkgs/by-name/vn/vndr/package.nix b/pkgs/by-name/vn/vndr/package.nix
new file mode 100644
index 0000000000000..79cbc3e7e4e42
--- /dev/null
+++ b/pkgs/by-name/vn/vndr/package.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule {
+  pname = "vndr";
+  version = "0.1.2-unstable-2022-12-29";
+
+  src = fetchFromGitHub {
+    owner = "LK4D4";
+    repo = "vndr";
+    rev = "87603e47e8ea2ddac96f508fc9e9d6fc17b198b0";
+    sha256 = "sha256-L7OemAPCv7epOVmjrDDtiGqQqzscm5zj3C6dsZP4uUc=";
+  };
+
+  vendorHash = null;
+
+  postPatch = ''
+    go mod init github.com/LK4D4/vndr
+  '';
+
+  # Tests rely on the 'vndr' binary being in the PATH already.
+  doCheck = false;
+
+  meta = {
+    description = "Stupid golang vendoring tool, inspired by docker vendor script";
+    mainProgram = "vndr";
+    homepage = "https://github.com/LK4D4/vndr";
+    maintainers = with lib.maintainers; [ vdemeester rvolosatovs ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
deleted file mode 100644
index 29668e3097e7c..0000000000000
--- a/pkgs/development/tools/vndr/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildGoPackage, fetchFromGitHub }:
-
-buildGoPackage rec {
-  pname = "vndr-unstable";
-  version = "2020-07-28";
-  rev = "f12b881cb8f081a5058408a58f429b9014833fc6";
-
-  goPackagePath = "github.com/LK4D4/vndr";
-  excludedPackages = "test";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "LK4D4";
-    repo = "vndr";
-    sha256 = "04za4x8p8qzwjlp4i0j0gsb4xx0x9f4yp3ab0b97r50pah1ac2g3";
-  };
-
-  meta = {
-    description = "Stupid golang vendoring tool, inspired by docker vendor script";
-    mainProgram = "vndr";
-    homepage = "https://github.com/LK4D4/vndr";
-    maintainers = with lib.maintainers; [ vdemeester rvolosatovs ];
-    license = lib.licenses.asl20;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ab567c421e6c5..fd6ca38ddd6cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28004,8 +28004,6 @@ with pkgs;
 
   vendir = callPackage ../development/tools/vendir { };
 
-  vndr = callPackage ../development/tools/vndr { };
-
   vdo = callPackage ../os-specific/linux/vdo { };
 
   windows = callPackages ../os-specific/windows {};