* [bug#63898] [PATCH] gnu: Add plan9port.
@ 2023-06-05 0:07 Antero Mejr via Guix-patches via
2023-07-01 16:14 ` bug#63898: " Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Antero Mejr via Guix-patches via @ 2023-06-05 0:07 UTC (permalink / raw)
To: 63898
* gnu/packages/plan9.scm (plan9port): New variable.
---
gnu/packages/plan9.scm | 99 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 99 insertions(+)
diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm
index 318344f2ec..747a1aaf64 100644
--- a/gnu/packages/plan9.scm
+++ b/gnu/packages/plan9.scm
@@ -20,8 +20,13 @@ (define-module (gnu packages plan9)
#:use-module (guix build-system gnu)
#:use-module (guix git-download)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (gnu packages base)
+ #:use-module (gnu packages commencement)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages perl)
#:use-module (gnu packages xorg))
(define-public drawterm
@@ -63,3 +68,97 @@ (define-public drawterm
Plan 9 systems. It behaves like a Plan 9 kernel and will attempt to
reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.")
(license license:expat))))
+
+(define-public plan9port
+ ;; no releases
+ (let ((commit "cc4571fec67407652b03d6603ada6580de2194dc")
+ (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")))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;no tests
+ #: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
+ "/font/fixed/unicode.5x8.font"))
+ (("/lib/font/bit/lucm/unicode.9.font")
+ (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* "src/cmd/fontsrv/freetyperules.sh"
+ (("'\\$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)))
+ (delete 'configure) ;no configure
+ (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"))
+ (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")))))
+ ;; Plan9 doesn't compress man pages
+ (delete 'compress-documentation))))
+ (native-inputs (list perl which))
+ (inputs (list 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))
+ (home-page "https://9fans.github.io/plan9port/")
+ (synopsis "Port of many Plan 9 libraries and programs")
+ (description
+ "Plan 9 from User Space (aka plan9port) is a port of many Plan 9
+programs from their native Plan 9 environment to Unix-like operating
+systems.")
+ (license (list license:expat ;modifications
+ license:lpl1.02 ;original Plan9 code
+ license:zlib))))) ;src/cmd/bzip2
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#63898: [PATCH] gnu: Add plan9port.
2023-06-05 0:07 [bug#63898] [PATCH] gnu: Add plan9port Antero Mejr via Guix-patches via
@ 2023-07-01 16:14 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2023-07-01 16:14 UTC (permalink / raw)
To: Antero Mejr; +Cc: 63898-done
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
Hi,
Antero Mejr <antero@mailbox.org> 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’.
[-- Attachment #2: Type: text/x-patch, Size: 9019 bytes --]
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 宋文武 <iyzsong@member.fsf.org>
+;;; Copyright © 2023 Antero Mejr <antero@mailbox.org>
;;;
;;; 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-07-01 16:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-05 0:07 [bug#63898] [PATCH] gnu: Add plan9port Antero Mejr via Guix-patches via
2023-07-01 16:14 ` bug#63898: " Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).