From a838ee7a48c291359794dc09874103e6c7d59cd9 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 10 May 2025 10:48:33 +0200 Subject: [PATCH 1/2] mycorrhiza: Add darwin platform --- pkgs/by-name/my/mycorrhiza/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/my/mycorrhiza/package.nix b/pkgs/by-name/my/mycorrhiza/package.nix index 9ffd22c450e6..56196d09e8db 100644 --- a/pkgs/by-name/my/mycorrhiza/package.nix +++ b/pkgs/by-name/my/mycorrhiza/package.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildGoModule, @@ -34,7 +33,7 @@ buildGoModule rec { homepage = "https://github.com/bouncepaw/mycorrhiza"; license = licenses.agpl3Only; maintainers = with maintainers; [ chekoopa ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; mainProgram = "mycorrhiza"; }; } From 52aa41e553c5844a4c22e0aa7d3df7dde4867f44 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 12 May 2025 09:53:48 +0200 Subject: [PATCH 2/2] mycorrhiza: modernize by using finalAttrs and removing with lib from meta --- pkgs/by-name/my/mycorrhiza/package.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/my/mycorrhiza/package.nix b/pkgs/by-name/my/mycorrhiza/package.nix index 56196d09e8db..a688562270d4 100644 --- a/pkgs/by-name/my/mycorrhiza/package.nix +++ b/pkgs/by-name/my/mycorrhiza/package.nix @@ -6,14 +6,14 @@ git, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "mycorrhiza"; version = "1.15.1"; src = fetchFromGitHub { owner = "bouncepaw"; repo = "mycorrhiza"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-Cgf2YtAatfKWxhe4xAqNRB4ktsGs3ONi5XqbjcZwzTw="; }; @@ -28,12 +28,12 @@ buildGoModule rec { --prefix PATH : ${lib.makeBinPath [ git ]} ''; - meta = with lib; { + meta = { description = "Filesystem and git-based wiki engine written in Go using mycomarkup as its primary markup language"; homepage = "https://github.com/bouncepaw/mycorrhiza"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ chekoopa ]; - platforms = with platforms; linux ++ darwin; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ chekoopa ]; + platforms = lib.platforms.unix; mainProgram = "mycorrhiza"; }; -} +})