From patchwork Sat Feb 17 01:39:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Justin Veilleux X-Patchwork-Id: 60491 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 8F4E427BBEC; Sun, 18 Feb 2024 18:23:02 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 6659327BBE9 for ; Sun, 18 Feb 2024 18:23:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rblnS-0006ru-OL; 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 1rblnR-0006pj-2F for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:49 -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 1rblnQ-0002KW-Pb for guix-patches@gnu.org; Sun, 18 Feb 2024 13:21:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblnl-0002xd-CB for guix-patches@gnu.org; Sun, 18 Feb 2024 13:22:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69197] [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:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69197 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69197@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170828050911109 (code B ref -1); Sun, 18 Feb 2024 18:22:09 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:21:49 +0000 Received: from localhost ([127.0.0.1]:36959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblnQ-0002t7-GL for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:21:49 -0500 Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblRo-0001mW-Nh for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:59:29 -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 1rb9gO-0002ri-Ku for guix-patches@gnu.org; Fri, 16 Feb 2024 20:40:00 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rb9gM-00040C-Pw for guix-patches@gnu.org; Fri, 16 Feb 2024 20:40:00 -0500 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-29041136f73so2134433a91.0 for ; Fri, 16 Feb 2024 17:39:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708133997; x=1708738797; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=FFL6RafGo3whbvPjYOcN4AlJvQ2Fw3+AGifMZSPi2Ks=; b=MCr/ufwqBdAFE1pVxREu8wOdg9V4x9OyKUS5VQtVUXFliSgJp4J0bb/cl4pYG0Axkj s6mqklDh8l4EZ6HiGaxZZemfdDtnkduvfHWr57CQE7G/VhWXTOz22+YFj1H7U91Nyjnf 0MrqyAPBQKl1bolVPo/K2bPY1ccj/LtLVAWoY6j2pGXjPQZI7YVPn6aZTFV38hB16cxC vGDr4Mi0eFxZDjGAzWKmUwrtvfPENHUzZwGbTCnyK01UhtM3MD2yyt6N8j9HO2fMwGkj 8M6mAwp977dPNZVicStRueR3MXwScApOnHVcWJlXSjUDt+h/DvqDwbYVUQx6dvdulScg 2nwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708133997; x=1708738797; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=FFL6RafGo3whbvPjYOcN4AlJvQ2Fw3+AGifMZSPi2Ks=; b=bJEHXjEQEKnz8gqZp1U5fzFL1iURyf97U/eGWgwjxUoUcUm3DA+oykJ4sQVo0y3YIo VzW2mdrfuMvvGFDQCWOkjnkhIHxOfUdecHfpWIxEs00SETD4BFislw0I7qfZl4YQPxlV 7xuFNt6N9vs9XtmpXe3keZ1Fk7qbz98KTTV2AEbSepOLX6tgTVvuNdP140c5ZRuhpKnG tpTAn4inFpihOYLLglMbnlcfB0vzhJsOTLJS6d6h1EGEKmdI+wWQVpFBoW1+v9vFQrFg zfF+2tdI0egSDyNQBWCNHup231Vdf2sNOhlD0uOK9vFBVNPUpD9cq3kLCmqJ0nWhQYgG Zc7g== X-Gm-Message-State: AOJu0YzUOphoLXK9i7hpwRszbGc/SepEF2bAo+FUDvO61jBt2TRrUGbJ olZjI8cc7oJrHT3FOHRcvjTw9K9TxqPVWIJTQ/HbgRraRmS7RdYl1xUkyaj0zSPDTU+pJ9uCXyL Zm0qNcMPDxpZ0AiB8gkEKA2URxcfot3ubnYQ= X-Google-Smtp-Source: AGHT+IHTK56rXtmKAp62yA8IfwHvums/Dk6zSEGhxV0qL4kvMNrJJbF+8oDpstFxjg4mIq56b95QrVbgYBqmpdeFi14= X-Received: by 2002:a17:90a:7443:b0:298:b4d9:2639 with SMTP id o3-20020a17090a744300b00298b4d92639mr6517687pjk.32.1708133996749; Fri, 16 Feb 2024 17:39:56 -0800 (PST) MIME-Version: 1.0 From: Justin Veilleux Date: Fri, 16 Feb 2024 20:39:45 -0500 Message-ID: Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=justun1011@gmail.com; helo=mail-pj1-x102b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 Hi. This is a patch for Diod, a 9p filesystem server. 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