From patchwork Sat Jul 1 16:14:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 51490 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 3480327BBE9; Sat, 1 Jul 2023 17:15:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS 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 CE45527BBE2 for ; Sat, 1 Jul 2023 17:15:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qFdFX-0005Rt-VF; Sat, 01 Jul 2023 12:15:03 -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 1qFdFW-0005R0-Nx for guix-patches@gnu.org; Sat, 01 Jul 2023 12:15:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qFdFW-0000fK-Eo for guix-patches@gnu.org; Sat, 01 Jul 2023 12:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qFdFW-0006Tq-A4 for guix-patches@gnu.org; Sat, 01 Jul 2023 12:15:02 -0400 Subject: bug#63898: [PATCH] gnu: Add plan9port. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Sat, 01 Jul 2023 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 63898 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Antero Mejr Cc: 63898-done@debbugs.gnu.org Mail-Followup-To: 63898@debbugs.gnu.org, ludo@gnu.org, antero@mailbox.org Received: via spool by 63898-done@debbugs.gnu.org id=D63898.168822810124880 (code D ref 63898); Sat, 01 Jul 2023 16:15:02 +0000 Received: (at 63898-done) by debbugs.gnu.org; 1 Jul 2023 16:15:01 +0000 Received: from localhost ([127.0.0.1]:58551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFdFU-0006TE-EA for submit@debbugs.gnu.org; Sat, 01 Jul 2023 12:15:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qFdFS-0006T1-RJ for 63898-done@debbugs.gnu.org; Sat, 01 Jul 2023 12:14:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFdFM-0000dr-Il; Sat, 01 Jul 2023 12:14:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=TEq4esQktvjFAbjEUpoS77teGtXqzhbuEldbb4LwLvs=; b=GxDWU5zKb7mt7/s5nj7G KliSFk5Jgd7ATxqQle6KzpfEkhFCezMswa67ZIe8tkPvnvso+ddSQz8nlQXDzXTDnZuNridaNuw7B 7yn+GfMce145NYJAVcNXSAO4YtIEOFOD6nxnYlmgvaBXnsC2NIpQb5Z3n8hAId/BjDO+mf/3QFz7E xO+gWWK25m/dOUhp26tyHLTIFoaY7xjMoORAnGMbvcd0YaZjA5EOdUMx31hi3PO6TucHWPzIStfZ5 Z9psoV3DlQMyS+aoNjPi4Fvet+4kFb9/BHwiAArZXV++V3wH3LrdkMmtvMNCMOWoZBE9wrQgkbcgO CzNwjzJRzBi5aA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qFdFM-0001kE-6N; Sat, 01 Jul 2023 12:14:52 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20230605000755.15416-1-antero@mailbox.org> Date: Sat, 01 Jul 2023 18:14:50 +0200 In-Reply-To: <20230605000755.15416-1-antero@mailbox.org> (Antero Mejr's message of "Mon, 5 Jun 2023 00:07:55 +0000") Message-ID: <87cz1by5fp.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) 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 Hi, Antero Mejr skribis: > * gnu/packages/plan9.scm (plan9port): New variable. Applied after addressing ‘lint’ warnings (tabs, missing ‘bash-minimal’ input) and adding a copyright line for you. Thanks, Ludo’. diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index 747a1aaf64..f78c26e215 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 宋文武 +;;; Copyright © 2023 Antero Mejr ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ (define-module (gnu packages plan9) #:use-module (guix utils) #:use-module ((guix licenses) #:prefix license:) #: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) @@ -72,84 +74,96 @@ (define-public drawterm (define-public plan9port ;; no releases (let ((commit "cc4571fec67407652b03d6603ada6580de2194dc") - (revision "0")) + (revision "0")) (package (name "plan9port") (version (git-version "0.1.0" revision commit)) (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/9fans/plan9port") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1g2kzlghcghs560na6xalfsjq5zwp015wv9wk8wxn26981zs759x")) - (modules '((guix build utils))) - (snippet #~(for-each delete-file-recursively - '("font/luc" ;nonfree - "font/lucm" - "font/lucsans" - "font/pelm"))))) + (method git-fetch) + (uri (git-reference + (url "https://github.com/9fans/plan9port") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g2kzlghcghs560na6xalfsjq5zwp015wv9wk8wxn26981zs759x")) + (modules '((guix build utils))) + (snippet #~(for-each delete-file-recursively + '("font/luc" ;nonfree + "font/lucm" "font/lucsans" "font/pelm"))))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests - #:phases #~(modify-phases %standard-phases + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'setup (lambda _ (delete-file "src/cmd/mk/mk.pdf") (substitute* "src/cmd/acme/acme.c" (("/lib/font/bit/lucsans/euro.8.font") - (string-append - #$output + (string-append #$output "/font/fixed/unicode.5x8.font")) (("/lib/font/bit/lucm/unicode.9.font") - (string-append - #$output + (string-append #$output "/font/fixed/unicode.6x9.font"))) (substitute* (find-files "src") (("/lib/font/bit") (string-append #$output "/font"))) - (substitute* "bin/9c" - (("which") (which "which"))) + (substitute* "bin/9c" + (("which") + (which "which"))) (substitute* "src/cmd/fontsrv/freetyperules.sh" - (("'\\$i'/freetype2") - (string-append "-I" #$freetype - "/include/freetype2"))) + (("'\\$i'/freetype2") + (string-append "-I" + #$freetype + "/include/freetype2"))) (with-output-to-file "LOCAL.config" - (lambda _ - (format #t "CC9=~a~%" #$(cc-for-target)) - (format #t "FONTSRV=fontsrv~%"))) - (setenv "X11" #$libx11) - (setenv "PLAN9" (getcwd)) - (setenv "PLAN9_TARGET" #$output))) + (lambda _ + (format #t "CC9=~a~%" #$(cc-for-target)) + (format #t "FONTSRV=fontsrv~%"))) + (setenv "X11" + #$libx11) + (setenv "PLAN9" + (getcwd)) + (setenv "PLAN9_TARGET" + #$output))) (delete 'configure) ;no configure - (replace 'build - (lambda _ + (replace 'build + (lambda _ (invoke "./INSTALL" "-b"))) - (replace 'install - (lambda _ - (for-each - (lambda (x) - (let ((out (string-append #$output "/" x))) - (mkdir-p out) - (copy-recursively x out))) - ;; TODO: use external sky and dict packages - '("bin" "face" "font" "include" "lib" "lp" - "mail" "man" "ndb" "plumb" "tmac" "troff" - "postscript")) + (replace 'install + (lambda _ + (for-each (lambda (x) + (let ((out (string-append #$output + "/" x))) + (mkdir-p out) + (copy-recursively x out))) + ;; TODO: use external sky and dict packages + '("bin" "face" + "font" + "include" + "lib" + "lp" + "mail" + "man" + "ndb" + "plumb" + "tmac" + "troff" + "postscript")) (install-file "rcmain" #$output))) - (add-after 'install 'wrap-executables - (lambda _ - (for-each - (lambda (exe) - (wrap-program exe - `("PLAN9" ":" prefix (,#$output)))) - (find-files (string-append #$output "/bin"))))) + (add-after 'install 'wrap-executables + (lambda _ + (for-each (lambda (exe) + (wrap-program exe + `("PLAN9" ":" prefix + (,#$output)))) + (find-files + (string-append #$output "/bin"))))) ;; Plan9 doesn't compress man pages - (delete 'compress-documentation)))) + (delete 'compress-documentation)))) (native-inputs (list perl which)) - (inputs (list fontconfig libx11 libxext libxt)) + (inputs (list bash-minimal ;for 'wrap-program' + fontconfig libx11 libxext libxt)) ;; Propagate gcc-toolchain because some programs, like the 9c compiler, ;; are just aliased scripts to gcc equivalents. (propagated-inputs (list gcc-toolchain)) @@ -161,4 +175,4 @@ (define-public plan9port systems.") (license (list license:expat ;modifications license:lpl1.02 ;original Plan9 code - license:zlib))))) ;src/cmd/bzip2 + license:zlib))))) ;src/cmd/bzip2