From e9bd0e68af5d6d70b28ab598da200ebfb6002416 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sun, 24 Dec 2023 09:29:56 +0100
Subject: [PATCH 1/3] athens: drop buildGo121Module

---
 pkgs/by-name/at/athens/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index e511bd98e8bd..f1dd0b0a9281 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -1,8 +1,8 @@
 { lib
 , fetchFromGitHub
-, buildGo121Module
+, buildGoModule
 }:
-buildGo121Module rec {
+buildGoModule rec {
   pname = "athens";
   version = "0.13.0";
 

From 7ad281a1c3d2f91077053b1806c0b77fe6d78085 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sun, 24 Dec 2023 09:45:34 +0100
Subject: [PATCH 2/3] athens: add version test

---
 pkgs/by-name/at/athens/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index f1dd0b0a9281..426cadfcf190 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -1,6 +1,8 @@
 { lib
 , fetchFromGitHub
 , buildGoModule
+, testers
+, athens
 }:
 buildGoModule rec {
   pname = "athens";
@@ -25,6 +27,12 @@ buildGoModule rec {
     mv $out/bin/proxy $out/bin/athens
   '';
 
+  passthru = {
+    tests.version = testers.testVersion {
+      package = athens;
+    };
+  };
+
   meta = with lib; {
     description = "A Go module datastore and proxy";
     homepage = "https://github.com/gomods/athens";

From 928a5d009f15ddebf8bdff803b2b038a9a122330 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Sun, 24 Dec 2023 09:46:43 +0100
Subject: [PATCH 3/3] athens: remove timpath flag, don't use pname as repo

trimpath is already set by buildGoModule.
pname should not be used as src.repo, so pname can be overriden.
---
 pkgs/by-name/at/athens/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 426cadfcf190..f483e465f268 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -10,7 +10,7 @@ buildGoModule rec {
 
   src = fetchFromGitHub {
     owner = "gomods";
-    repo = pname;
+    repo = "athens";
     rev = "v${version}";
     hash = "sha256-27BBPDK5lGwEFsgLf+/lE9CM8g1AbGUgM1iOL7XZqsU=";
   };
@@ -19,7 +19,6 @@ buildGoModule rec {
 
   CGO_ENABLED = "0";
   ldflags = [ "-s" "-w" "-buildid=" "-X github.com/gomods/athens/pkg/build.version=${version}" ];
-  flags = [ "-trimpath" ];
 
   subPackages = [ "cmd/proxy" ];