[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[Sergio Durigan Junior]

Hi there,

I would like to propose the renaming of mastodon.scm to the more
generic name fediverse.scm.  This makes it possible to stuff more
fediverse-related packages into it, which is what the second patch in
the series does: it adds a package for snac2, which is a very simple
and elegant server that has great support for the Mastodon API.

Thanks,

Sergio Durigan Junior (2):
  gnu: mastodon: Rename to fediverse.scm
  gnu: fediverse: Add snac2

 gnu/local.mk                                 |  2 +-
 gnu/packages/{mastodon.scm => fediverse.scm} | 61 +++++++++++++++++++-
 2 files changed, 61 insertions(+), 2 deletions(-)
 rename gnu/packages/{mastodon.scm => fediverse.scm} (75%)


base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280
-- 
2.43.0

[bug#71587] [PATCH 1/2] gnu: mastodon: Rename to fediverse.scm

[Sergio Durigan Junior]

* gnu/local.mk (GNU_SYSTEM_MODULES): Rename mastodon.scm to fediverse.scm.
* gnu/packages/mastodon.scm: Rename to...
* gnu/packages/fediverse.scm: ...this.

Change-Id: Ibf736a341bbd53413bc8a7cf407579440dbe7b01

Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
Change-Id: I64d72d1ddea626dcebaab6ad50f7036934c1a1a5
---
 gnu/local.mk                                 | 2 +-
 gnu/packages/{mastodon.scm => fediverse.scm} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename gnu/packages/{mastodon.scm => fediverse.scm} (99%)

diff --git a/gnu/local.mk b/gnu/local.mk
index 83b7402b09..39d5aa7bc9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -271,6 +271,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/fabric-management.scm		\
   %D%/packages/fcitx.scm			\
   %D%/packages/fcitx5.scm			\
+  %D%/packages/fediverse.scm			\
   %D%/packages/figlet.scm			\
   %D%/packages/file.scm				\
   %D%/packages/file-systems.scm			\
@@ -441,7 +442,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/machine-learning.scm		\
   %D%/packages/magic-wormhole.scm		\
   %D%/packages/man.scm				\
-  %D%/packages/mastodon.scm			\
   %D%/packages/mail.scm				\
   %D%/packages/make-bootstrap.scm		\
   %D%/packages/markup.scm			\
diff --git a/gnu/packages/mastodon.scm b/gnu/packages/fediverse.scm
similarity index 99%
rename from gnu/packages/mastodon.scm
rename to gnu/packages/fediverse.scm
index b8006292ca..3f3c259726 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/fediverse.scm
@@ -18,7 +18,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (gnu packages mastodon)
+(define-module (gnu packages fediverse)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix gexp)
-- 
2.43.0

[bug#71587] [PATCH 2/2] gnu: fediverse: Add snac2

[Sergio Durigan Junior]

* gnu/packages/fediverse.scm (snac2): New variable.

Change-Id: I085a53d0fea909c19f0ec562cc361ead3e849a40

Signed-off-by: Sergio Durigan Junior <sergiodj@sergiodj.net>
Change-Id: I6ffcb08c13953baec32dc8a0f50cdc0deee76956
---
 gnu/packages/fediverse.scm | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/fediverse.scm b/gnu/packages/fediverse.scm
index 3f3c259726..beeacd364b 100644
--- a/gnu/packages/fediverse.scm
+++ b/gnu/packages/fediverse.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2019-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
+;;; Copyright © 2024 Sergio Durigan Junior <sergiodj@sergiodj.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,12 +24,15 @@ (define-module (gnu packages fediverse)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
   #:use-module (guix build-system pyproject)
   #:use-module (guix build-system python)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages check)
+  #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gettext)
@@ -44,6 +48,7 @@ (define-module (gnu packages fediverse)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages time)
+  #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
 (define-public toot
@@ -190,3 +195,57 @@ (define-public python-mastodon-py
     (description
      "This package provides a python wrapper for the Mastodon API.")
     (license license:expat)))
+
+(define-public snac2
+  (package
+    (name "snac2")
+    (version "2.55")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://codeberg.org/grunfink/snac2")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "06qmg0wy1f4r6l8j52jnma4d2b8sj8fqf52vn7qqbbs8jz7aj74s"))))
+    (build-system gnu-build-system)
+    (inputs `(,curl ,openssl))
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (delete 'configure)
+                  (add-after 'unpack 'remove-usr-local
+                    (lambda _
+                      (substitute* "Makefile"
+                        (("-I/usr/local/include")
+                         "")
+                        (("-L/usr/local/lib")
+                         "")) #t)))
+       #:tests? #f
+       #:make-flags (list ,(string-append "CC="
+                                          (cc-for-target))
+                          ,(string-append "CFLAGS=-O2 -g -Wall -Wextra")
+                          (string-append "PREFIX=" %output))))
+    (home-page "https://codeberg.org/grunfink/snac2")
+    (synopsis
+     "Simple, minimalistic ActivityPub instance written in portable C")
+    (description
+     "Snac is a simple, minimalistic ActivityPub instance written in
+portable C.
+
+It features:
+
+@itemize
+@item Lightweight, minimal dependencies
+@item Extensive support of ActivityPub operations, e.g. write public notes,
+follow users, be followed, reply to the notes of others, admire wonderful
+content (like or boost), write private messages, etc.
+@item Multiuser support
+@item Mastodon API support, so Mastodon-compatible apps can be used
+@item Simple but effective web interface
+@item Easily-accessed MUTE button to silence users
+@item Tested interoperability with related software
+@item No database needed
+@item Totally JavaScript-free; no cookies either
+@end itemize")
+    (license license:expat)))
-- 
2.43.0

[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[MSavoritias]

On Sun, 16 Jun 2024 00:46:19 -0400
Sergio Durigan Junior <sergiodj@sergiodj.net> wrote:

> Hi there,
> 
> I would like to propose the renaming of mastodon.scm to the more
> generic name fediverse.scm.  This makes it possible to stuff more
> fediverse-related packages into it, which is what the second patch in
> the series does: it adds a package for snac2, which is a very simple
> and elegant server that has great support for the Mastodon API.

What about renaming it to activitypub.scm ?
Since we want it to describe the protocol i guess.
"fediverse" seems to generic and i doubt people would know what it is
if they don't know the context it is used in.

MSavoritias
> 
> Thanks,
> 
> Sergio Durigan Junior (2):
>   gnu: mastodon: Rename to fediverse.scm
>   gnu: fediverse: Add snac2
> 
>  gnu/local.mk                                 |  2 +-
>  gnu/packages/{mastodon.scm => fediverse.scm} | 61
> +++++++++++++++++++- 2 files changed, 61 insertions(+), 2 deletions(-)
>  rename gnu/packages/{mastodon.scm => fediverse.scm} (75%)
> 
> 
> base-commit: 612e4dd98f7d1d015e405af9d029bede3fe3c280

[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[Sergio Durigan Junior]

On Monday, June 17 2024, MSavoritias wrote:

> On Sun, 16 Jun 2024 00:46:19 -0400
> Sergio Durigan Junior <sergiodj@sergiodj.net> wrote:
>
>> Hi there,
>> 
>> I would like to propose the renaming of mastodon.scm to the more
>> generic name fediverse.scm.  This makes it possible to stuff more
>> fediverse-related packages into it, which is what the second patch in
>> the series does: it adds a package for snac2, which is a very simple
>> and elegant server that has great support for the Mastodon API.
>
> What about renaming it to activitypub.scm ?
> Since we want it to describe the protocol i guess.
> "fediverse" seems to generic and i doubt people would know what it is
> if they don't know the context it is used in.

Thanks for the reply!

In my experience the term "fediverse" is more popular, while ActivityPub
is more technical.  On top of that,
https://en.wikipedia.org/wiki/Fediverse implies that Fediverse is
composed of more than ActivityPub instances.

Either way, I'm open to renaming the file if you really think it's
better.

Thanks!

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/

[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[Sergio Durigan Junior]

On Sunday, June 16 2024, I wrote:

> I would like to propose the renaming of mastodon.scm to the more
> generic name fediverse.scm.  This makes it possible to stuff more
> fediverse-related packages into it, which is what the second patch in
> the series does: it adds a package for snac2, which is a very simple
> and elegant server that has great support for the Mastodon API.

Ping.

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/

[bug#71587] [PATCH 0/2] Rename mastodon.scm -> fediverse.scm and add snac2

[Sergio Durigan Junior]

On Thursday, June 20 2024, I wrote:

> On Sunday, June 16 2024, I wrote:
>
>> I would like to propose the renaming of mastodon.scm to the more
>> generic name fediverse.scm.  This makes it possible to stuff more
>> fediverse-related packages into it, which is what the second patch in
>> the series does: it adds a package for snac2, which is a very simple
>> and elegant server that has great support for the Mastodon API.
>
> Ping.

Ping^2.

-- 
Sergio
GPG key ID: 237A 54B1 0287 28BF 00EF  31F4 D0EB 7628 65FC 5E36
Please send encrypted e-mail if possible
https://sergiodj.net/

bug#71587: Close

[Andreas Enge]

Hello,

thanks for the patches!

I think renaming is a good idea; details are of course of the order of
bikeshedding. Since I like fediverse better, I kept your patch.

Concerning snac2, I have decided to call it snac instead. This is how it
is called on the author's github page (the largest heading), and it is
also the name of the binary. I have modernised the patch using gexps,
removed the #t return value of a phase, and added a comment why tests
are disabled.

There is no need to sign off your own patches, since you are already the
author.

Something strange happened with the change ids, there were two of them
in each commit; I have kept one every time.

Andreas