From patchwork Fri May 9 23:46:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 42494 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5041327BC4A; Sat, 10 May 2025 00:48:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C11BC27BC49 for ; Sat, 10 May 2025 00:48:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uDXRm-0005lt-FI; Fri, 09 May 2025 19:48:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uDXRj-0005ki-Ch for guix-patches@gnu.org; Fri, 09 May 2025 19:48:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uDXRi-0003o6-Hs for guix-patches@gnu.org; Fri, 09 May 2025 19:48:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=FImQqZsbXFvreNYX709mW1t85U6yogui4Cf0W7AP06Y=; b=uGMNw6HCJxpvwDpespCEm5nRJ7TcK4t2nC6V3mqEzUaOYd5Wrf7EBlvdNSEtFqM37+gatN6tiS0X41GZKQE3wbkp2kHP3ZFGB0WpDwCRtCsI6PWYdIWdNDIGG1V6+Hq+yZ72ZITFDjMbYpA+UkFEydj/ahhB41ndpzbt7hhSg/NhfFKsqgik5SQlX8ceIO5PSJYd5mkbe88Iq8YdjxTanjVk9T9lUQNK5WID2GDjaNh5DaB2Y5lt71avZMyvWTlKbmDmpe7YQl4pp4cnatmWqig85BhM0J42MrBDChLe+oMFhj5hAS91t/A9g+DowksVfORuk+QlHA9umOz/z0epwA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uDXRi-0004fy-5a for guix-patches@gnu.org; Fri, 09 May 2025 19:48:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74864] [PATCH v3] gnu: Add adl-submit. References: In-Reply-To: Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 May 2025 23:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74864 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74864@debbugs.gnu.org, Sharlatan Hellseher , Simon Tournier Cc: Denis 'GNUtoo' Carikli Received: via spool by 74864-submit@debbugs.gnu.org id=B74864.174683446417938 (code B ref 74864); Fri, 09 May 2025 23:48:02 +0000 Received: (at 74864) by debbugs.gnu.org; 9 May 2025 23:47:44 +0000 Received: from localhost ([127.0.0.1]:41353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uDXRP-0004fD-LP for submit@debbugs.gnu.org; Fri, 09 May 2025 19:47:44 -0400 Received: from cyberdimension.org ([2001:678:938:3ff::36]:48598 helo=rockpro64.cyberdimension.org) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uDXRK-0004ew-Sc for 74864@debbugs.gnu.org; Fri, 09 May 2025 19:47:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=dkim; bh=Je1dVsVAcWx565t BuU7hhJjo+9f66ejVyoIZkZDhlvM=; h=date:subject:cc:to:from; d=cyberdimension.org; b=qxzCweLL0VbvkI8vV7i11MCKK7HtURoUkKNFQr0PzvTYTQ 8IpV3NzZUqOK2JBlsTNEBn4K7MYvJDAkFvbPGspewnB7obd/aQhUsfeXQBQLbhbTH84YaV oGrkEJ4IYvl3Cdtrr6DxHalt5AXEEyJNJsDGA8QULsDHyriRJg9t7qvbpu9oHXGQ8SF+MV Z/qnVZQR4o3+TDSV+eCSyMrF7Y1MHFkYbyxVxQyU+T2ZztrUgKzD9FmrcdXFQKSOpB01Nl OKcTPUHD94zwEyJO2oGUeIusnPrrdnz8CXxn5L+4UEfNYyjNkMC1DhD8PWR7+/V+qeuvHT oV9RX9tz7LWOfEtQ== Received: from localhost.localdomain (localhost [127.0.0.1]) by rockpro64.cyberdimension.org (OpenSMTPD) with ESMTP id 643952b2; Fri, 9 May 2025 23:47:34 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Sat, 10 May 2025 01:46:59 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/calendar.scm (adl-submit): New variable. Signed-off-by: Denis 'GNUtoo' Carikli Change-Id: Icd9438fbaf2c53635989fb8cfb443d2c3e541eff --- ChangeLog v2->v3: * Updated copyright to 2025. * Switch to a new repository that only has adl-submit and not the full Agenda Du Libre code. This simplifies license compliance because while the Agenda Du Libre web application was fully free it also pulled in compiled/minified JavaScript from other sources (probably with a script if I understood well the maintainer). This repository is co-maintained by both the Agenda Du Libre maintainer (Esharp) and me, though if I understood well, in practice the maintainer trusts me to do what's best and doesn't necessarily and only reviewed a bit the commits until the revision 9c62c13ba35720b2d0fdbc37c19cbb55cef6d5c1 ("Add .gitignore."). * Switch to a new git revision that uses the python build system. So we don't need to do any workarounds anymore in the Guix package. And beside some small fixes, it also has some improvements: * adl-submit.py was renamed to adl-submit and #!/usr/bin/python3 is now used as per Debian Guidelines on packaging python scripts. * All the authors copyrights are now added in the copyright header of the python script. This required to contact 2 authors to make sure who between them has copyright on a specific commit as they both collaborated together to do it. * The READMEs are now shipped as part of the documentation. --- gnu/packages/calendar.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) base-commit: 7d29ea6c4968de56e9edcae2632aa53d5f2e5e61 diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index ed7a13a2c9..84f83fe9c4 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Peng Mei Yu ;;; Copyright © 2021 Wamm K. D. ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2025 Denis 'GNUtoo' Carikli ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sphinx) @@ -65,6 +67,34 @@ (define-module (gnu packages calendar) #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) +(define-public python-adl-submit + (let ((revision "1") + (commit "f38c7ad161fbe6ec72ecc725edbd624f5c627ea9")) + (package + (name "python-adl-submit") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://framagit.org/agenda-libre/adl-submit.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zi5s8xpbm253mjdlcc1j13qqz5q7s9zavk3h0m2gfgb52xy2avp")))) + (build-system python-build-system) + (inputs (list python python-pycurl)) + (home-page "https://www.agendadulibre.org") + (synopsis "Submit events to the Agenda Du Libre") + (description "adl-submit is a tool that can be used to submit events +to any instance of the Agenda Du Libre (a web calendar originally meant for +free software events). Users can set fields through the command line or +create an XML that can be submitted with the adl-submit tool. While the +Agenda Du Libre web application is available in multiple languages, most of +the events on https://www.agendadulibre.org are in French and the +adl-submit tool is only available in French.") + (license license:gpl2)))) + (define-public date ;; We make the same choice as the Arch package maintainer by choosing a ;; recent commit to fix some bugs.