From 56f7097c9a90f30d223ee2da1a17ecb7793091fe Mon Sep 17 00:00:00 2001
From: Kerstin Humm
Date: Fri, 21 Mar 2025 13:15:06 +0100
Subject: [PATCH 1/2] overview: better rendering for subgrants
Co-authored-by: Fedi Jamoussi
---
overview/default.nix | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/overview/default.nix b/overview/default.nix
index d5ab96510..36dae7210 100644
--- a/overview/default.nix
+++ b/overview/default.nix
@@ -151,16 +151,14 @@ let
subgrants = rec {
one = subgrant: ''
-
+ [${subgrant}](https://nlnet.nl/project/${subgrant})
'';
- many =
- subgrants:
- optionalString (subgrants != [ ]) ''
-
- ${concatLines (map one subgrants)}
-
- '';
+ many = subgrants: ''
+
+ ${concatLines (map one subgrants)}
+
+ '';
};
metadata = rec {
@@ -171,8 +169,12 @@ let
${metadata.summary}
'')
- + (optionalString (metadata ? subgrants) ''
- ${render.subgrants.many metadata.subgrants}
+ + (optionalString (metadata ? subgrants && metadata.subgrants != [ ]) ''
+
+ This project is funded through these NGI subgrants:
+
+ ${render.subgrants.many metadata.subgrants}
+
'');
};
From f648d8a97d23f2628a0bee8353bbcc865aee6409 Mon Sep 17 00:00:00 2001
From: Kerstin
Date: Mon, 24 Mar 2025 13:23:54 +0100
Subject: [PATCH 2/2] Update overview/default.nix
Co-authored-by: Valentin Gagarin
---
overview/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/overview/default.nix b/overview/default.nix
index 36dae7210..22dde578e 100644
--- a/overview/default.nix
+++ b/overview/default.nix
@@ -171,7 +171,7 @@ let
'')
+ (optionalString (metadata ? subgrants && metadata.subgrants != [ ]) ''
- This project is funded through these NGI subgrants:
+ This project is funded by NLnet through these subgrants:
${render.subgrants.many metadata.subgrants}