From 2813d781c5fc6e24d48e0468f08d9a2747aa20e1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 25 Oct 2022 12:22:38 +0200 Subject: [PATCH] magnetico: 0.12.0 -> unstable-2022-08-10 Note: this switches a more recently update fork, https://github.com/ireun/magnetico --- .../networking/p2p/magnetico/default.nix | 27 ++++++++++++++----- pkgs/top-level/all-packages.nix | 5 +--- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index 124e3492c8cd..f7130edf66a5 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -1,27 +1,40 @@ -{ lib, fetchFromGitHub, buildGoModule, go-bindata }: +{ lib +, fetchFromGitHub +, nixosTests +, buildGoModule +}: buildGoModule rec { pname = "magnetico"; - version = "0.12.0"; + version = "unstable-2022-08-10"; src = fetchFromGitHub { - owner = "boramalper"; + owner = "ireun"; repo = "magnetico"; - rev = "v${version}"; - sha256 = "1avqnfn4llmc9xmpsjfc9ivki0cfvd8sljfzd9yac94xcj581s83"; + rev = "828e230d3b3c0759d3274e27f5a7b70400f4d6ea"; + sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorSha256 = "087kikj6sjhjxqymnj7bpxawfmwckihi6mbmi39w0bn2040aflx5"; + vendorSha256 = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; - nativeBuildInputs = [ go-bindata ]; buildPhase = '' + runHook preBuild + make magneticow magneticod + + runHook postBuild ''; checkPhase = '' + runHook preBuild + make test + + runHook postBuild ''; + passthru.tests = { inherit (nixosTests) magnetico; }; + meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite"; homepage = "https://github.com/boramalper/magnetico"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05182417be43..940c77082afd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29996,10 +29996,7 @@ with pkgs; electron = electron_9; }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; mastodon-bot = nodePackages.mastodon-bot;