From caf25eb5236f0ba41d2efa33cda601aa9f0530ed Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Wed, 22 May 2024 19:14:22 +0200
Subject: [PATCH] mods: unbreak, modernize

There were two tests that required internet access, and so we just skip
them. Also moved to `pkgs/by-name` and reformatted with
`nixfmt-rfc-style`.
---
 .../mo/mods/package.nix}                      | 22 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 9 deletions(-)
 rename pkgs/{tools/misc/mods/default.nix => by-name/mo/mods/package.nix} (75%)

diff --git a/pkgs/tools/misc/mods/default.nix b/pkgs/by-name/mo/mods/package.nix
similarity index 75%
rename from pkgs/tools/misc/mods/default.nix
rename to pkgs/by-name/mo/mods/package.nix
index 331992986264..a653fb3de0c4 100644
--- a/pkgs/tools/misc/mods/default.nix
+++ b/pkgs/by-name/mo/mods/package.nix
@@ -1,9 +1,10 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, gitUpdater
-, testers
-, mods
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gitUpdater,
+  testers,
+  mods,
 }:
 
 buildGoModule rec {
@@ -19,7 +20,14 @@ buildGoModule rec {
 
   vendorHash = "sha256-BL5bxyeVkcm7GO1Kzk9d/hj2wY50UhauEFq9YQ/JbCE=";
 
-  ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=${version}"
+  ];
+
+  # These tests require internet access.
+  checkFlags = [ "-skip=^TestLoad/http_url$|^TestLoad/https_url$" ];
 
   passthru = {
     updateScript = gitUpdater {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee2907d324cc..21e8a5b1ad61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1067,8 +1067,6 @@ with pkgs;
 
   mod = callPackage ../development/tools/mod { };
 
-  mods = callPackage ../tools/misc/mods { };
-
   mongosh = callPackage ../development/tools/mongosh { };
 
   mya = callPackage ../applications/misc/mya { };