From bf9a88db617fed06a6303373bbdc9201a36b1b8b Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Mon, 8 Aug 2022 21:24:57 +1000
Subject: [PATCH] go: add smoke test to passthru

---
 pkgs/development/compilers/go/1.18.nix | 10 +++++++++-
 pkgs/development/compilers/go/1.19.nix | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix
index d12bd3984d18..7b208da59882 100644
--- a/pkgs/development/compilers/go/1.18.nix
+++ b/pkgs/development/compilers/go/1.18.nix
@@ -11,11 +11,16 @@
 , buildPackages
 , pkgsBuildTarget
 , threadsCross
+, testers
+, skopeo
+, buildGo118Module
 }:
 
 let
   goBootstrap = buildPackages.callPackage ./bootstrap116.nix { };
 
+  skopeoTest = skopeo.override { buildGoModule = buildGo118Module; };
+
   goarch = platform: {
     "aarch64" = "arm64";
     "arm" = "arm";
@@ -160,7 +165,10 @@ stdenv.mkDerivation rec {
   disallowedReferences = [ goBootstrap ];
 
   passthru = {
-    inherit goBootstrap;
+    inherit goBootstrap skopeoTest;
+    tests = {
+      skopeo = testers.testVersion { package = skopeoTest; };
+    };
   };
 
   meta = with lib; {
diff --git a/pkgs/development/compilers/go/1.19.nix b/pkgs/development/compilers/go/1.19.nix
index 4fc48b8dea18..0bc473b13d34 100644
--- a/pkgs/development/compilers/go/1.19.nix
+++ b/pkgs/development/compilers/go/1.19.nix
@@ -11,11 +11,16 @@
 , buildPackages
 , pkgsBuildTarget
 , threadsCross
+, testers
+, skopeo
+, buildGo119Module
 }:
 
 let
   goBootstrap = buildPackages.callPackage ./bootstrap116.nix { };
 
+  skopeoTest = skopeo.override { buildGoModule = buildGo119Module; };
+
   goarch = platform: {
     "aarch64" = "arm64";
     "arm" = "arm";
@@ -160,7 +165,10 @@ stdenv.mkDerivation rec {
   disallowedReferences = [ goBootstrap ];
 
   passthru = {
-    inherit goBootstrap;
+    inherit goBootstrap skopeoTest;
+    tests = {
+      skopeo = testers.testVersion { package = skopeoTest; };
+    };
   };
 
   meta = with lib; {