From 6b10bbcd240899c84a34cf8342ff448d164b3db1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 13 Jun 2024 01:34:44 +0200 Subject: [PATCH] magnetico: fix build (cherry picked from commit a2395a2e722fb106c1ea977dd2aef84fc0699dc2) --- .../networking/p2p/magnetico/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 6c09ae892e27..f3579c494ba8 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,10 +1,12 @@ { lib , fetchFromGitHub +, fetchpatch , nixosTests , buildGoModule +, sqlite }: -buildGoModule rec { +buildGoModule { pname = "magnetico"; version = "unstable-2022-08-10"; @@ -12,10 +14,20 @@ buildGoModule rec { owner = "ireun"; repo = "magnetico"; rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; - sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; + hash = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorHash = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; + patches = [ + # https://github.com/ireun/magnetico/pull/15 + (fetchpatch { + url = "https://github.com/ireun/magnetico/commit/90db34991aa44af9b79ab4710c638607c6211c1c.patch"; + hash = "sha256-wC9lVQqfngQ5AaRgb4TtoWSgbQ2iSHeQ2UBDUyWjMK8="; + }) + ]; + + vendorHash = "sha256-JDrBXjnQAcWp8gKvnm+q1F5oV+FozKUvhHK/Me/Cyj8="; + + buildInputs = [ sqlite ]; buildPhase = '' runHook preBuild @@ -26,18 +38,16 @@ buildGoModule rec { ''; checkPhase = '' - runHook preBuild + runHook preCheck make test - runHook postBuild + runHook postCheck ''; passthru.tests = { inherit (nixosTests) magnetico; }; meta = with lib; { - # Build fails with Go >=1.21, couldn't be fixed by updating module dependencies. - broken = true; description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/ireun/magnetico"; license = licenses.agpl3Only;