From patchwork Sat Feb 17 01:29:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Justin Veilleux X-Patchwork-Id: 60490 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 A576127BBE9; Sun, 18 Feb 2024 18:22:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 1000027BBE2 for ; Sun, 18 Feb 2024 18:22:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rblnS-0006rH-9W; Sun, 18 Feb 2024 13:21:50 -0500 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 1rblnP-0006mR-KZ for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:48 -0500 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 1rblnP-0002KJ-CR for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblnj-0002x3-Sa for guix-patches@gnu.org; Sun, 18 Feb 2024 13:22:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69195] [PATCH] gnu: Add diod. Resent-From: Justin Veilleux Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:22:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69195 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69195@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170828050010998 (code B ref -1); Sun, 18 Feb 2024 18:22:07 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:21:40 +0000 Received: from localhost ([127.0.0.1]:36951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblnH-0002qo-5J for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:21:40 -0500 Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblRp-0001mW-L7 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:59:30 -0500 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 1rb9WZ-00068i-4O for guix-patches@gnu.org; Fri, 16 Feb 2024 20:29:51 -0500 Received: from mail.cock.li ([37.120.193.123]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rb9WW-0002K6-DV for guix-patches@gnu.org; Fri, 16 Feb 2024 20:29:50 -0500 From: Justin Veilleux DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cock.li; s=mail; t=1708133384; bh=gmqeO1B+LrJ771nTIXeBcGACEYZgcAu+1iFcKc+VvbI=; h=From:To:Subject:Date:From; b=DItj8m/15aShoiGlEGJff2nvFLpjyrFKTfZbt0lBz2itPn7e5oBQ5uuM/npTDMffI dJe+/MZ0ugbDPpr62qIVM5/zzOpy6wBdqpfWMQcBZ8YWI2DjM87l7bHvjNiuwDnRG3 r9UkuTDebLV9GrRY6UukNMSXqRVnFsePtdD4mMaALxKOrbCE4vlbvNqTQV3ugsxqED 5lXawnKDRNjcSC7iYeiXG7a22omYgHT46jVHf+8g+LnklYG4sPEUp/rEKo2pQ7D5T4 ha5P3SzfUNOvFtxF/VBKXNWLLL+LUASnBGiIzMxluWo37FwObC32DzveS6wvZhftdP fQvE8EhR/s3bw== Date: Fri, 16 Feb 2024 20:29:41 -0500 Message-ID: <87v86nev3u.fsf@cock.li> MIME-Version: 1.0 Received-SPF: pass client-ip=37.120.193.123; envelope-from=terramorpha@cock.li; helo=mail.cock.li X-Spam_score_int: -7 X-Spam_score: -0.8 X-Spam_bar: / X-Spam_report: (-0.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL=1.31, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action 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 This is a patch for the diod 9p file server. It is compatible with linux's `mount -t 9p -o trans=tcp` 9p module. Cheers. From a88e118700509d0db95f533fecd700976145718c Mon Sep 17 00:00:00 2001 Message-ID: From: terramorpha Date: Thu, 15 Feb 2024 22:36:39 -0500 Subject: [PATCH] gnu: Add diod. * gnu/packages/plan9.scm (diod): New variable. Change-Id: If8b8eea856376573c20141981cecd40723143737 --- gnu/packages/patches/diod-version.patch | 15 ++++++++ gnu/packages/plan9.scm | 47 ++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/diod-version.patch diff --git a/gnu/packages/patches/diod-version.patch b/gnu/packages/patches/diod-version.patch new file mode 100644 index 0000000000..0c7e5baae6 --- /dev/null +++ b/gnu/packages/patches/diod-version.patch @@ -0,0 +1,15 @@ +This patch fixes the version. + +diff --git a/configure.ac b/configure.ac +index 419056e..a160d6d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,7 +2,7 @@ + # Prologue + ## + AC_INIT([diod], +- m4_esyscmd([git describe --always | awk '/.*/ {sub(/^v/, ""); printf "%s",$1; exit}'])) ++ [master]) + AC_CONFIG_AUX_DIR([config]) + AC_CONFIG_MACRO_DIR([config]) + AC_CONFIG_SRCDIR([NEWS]) diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index f78c26e215..b5abbb628b 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 宋文武 ;;; Copyright © 2023 Antero Mejr +;;; Copyright © 2024 Justin Veilleux ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,12 +25,19 @@ (define-module (gnu packages plan9) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages commencement) #:use-module (gnu packages fontutils) #:use-module (gnu packages perl) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages autotools) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages lua) + #:use-module (gnu packages linux) + #:use-module (gnu packages admin)) (define-public drawterm (let ((revision "1") @@ -176,3 +184,40 @@ (define-public plan9port (license (list license:expat ;modifications license:lpl1.02 ;original Plan9 code license:zlib))))) ;src/cmd/bzip2 + +(define-public diod + (package + (name "diod") + (version "1.0.24") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chaos/diod") + ;; The last release was in 2014 + (commit "9da28f911978957dbec251c653200db7a4dcad6e"))) + (sha256 + (base32 "1kf981m615w9x2l8km360ap80mlds7pgd44jgrblh87cq1aq8pms")) + (patches + (search-patches "diod-version.patch")))) + (build-system gnu-build-system) + (inputs + (list + ncurses + lua + libcap + munge)) + (native-inputs + (list + autoconf + automake + pkg-config)) +(home-page "https://github.com/chaos/diod") + (synopsis + "Distributed I/O Daemon - a 9P file server") + (description + "Diod is a multi-threaded, user space file server that speaks 9P2000.L +protocol.") + (license license:gpl2+))) + + base-commit: a8196632647b343f8e03c8f12fbdc0cc84ff90f6 -- 2.41.0