pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #313739 from pluiedev/zhf-24.05/mods

mods: unbreak, modernize

authored by Robert Scott and committed by GitHub 5a414f74 1891093e

+15 -9
unified split
+15 -7
pkgs/tools/misc/mods/default.nix pkgs/by-name/mo/mods/package.nix
··· 1 - { lib 2 - , buildGoModule 3 - , fetchFromGitHub 4 - , gitUpdater 5 - , testers 6 - , mods 1 + { 2 + lib, 3 + buildGoModule, 4 + fetchFromGitHub, 5 + gitUpdater, 6 + testers, 7 + mods, 7 8 }: 8 9 9 10 buildGoModule rec { ··· 19 20 20 21 vendorHash = "sha256-BL5bxyeVkcm7GO1Kzk9d/hj2wY50UhauEFq9YQ/JbCE="; 21 22 22 - ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; 23 + ldflags = [ 24 + "-s" 25 + "-w" 26 + "-X=main.Version=${version}" 27 + ]; 28 + 29 + # These tests require internet access. 30 + checkFlags = [ "-skip=^TestLoad/http_url$|^TestLoad/https_url$" ]; 23 31 24 32 passthru = { 25 33 updateScript = gitUpdater {
-2
pkgs/top-level/all-packages.nix
··· 1067 1067 1068 1068 mod = callPackage ../development/tools/mod { }; 1069 1069 1070 - mods = callPackage ../tools/misc/mods { }; 1071 - 1072 1070 mongosh = callPackage ../development/tools/mongosh { }; 1073 1071 1074 1072 mya = callPackage ../applications/misc/mya { };