GNU bug report logs -
#65681
[PATCH 1/2] gnu: simh: Update to 3.12-4.
Previous Next
Reported by: iyzsong <at> envs.net
Date: Fri, 1 Sep 2023 14:52:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65681 in the body.
You can then email your comments to 65681 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#65681; Package
guix-patches.
(Fri, 01 Sep 2023 14:52:01 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
iyzsong <at> envs.net:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Fri, 01 Sep 2023 14:52:01 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: 宋文武 <iyzsong <at> member.fsf.org>
* gnu/packages/simh.scm (simh): Update to 3.12-4.
[source]: Switch to url-fetch.
[native-inputs]: Add unzip.
[arguments]: Adjust make-flags.
---
gnu/packages/simh.scm | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 81d26bbde0..2cf92516ba 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -23,39 +23,47 @@ (define-module (gnu packages simh)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
- #:use-module (gnu packages admin))
+ #:use-module (guix utils)
+ #:use-module (gnu packages admin)
+ #:use-module (gnu packages compression))
(define-public simh
(package
(name "simh")
- (version "3.9-0")
+ (version "3.12-4")
(source
(origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/simh/simh")
- (commit (string-append "v" version))))
+ (method url-fetch)
+ (uri (list (string-append
+ "http://simh.trailing-edge.com/sources/simhv"
+ (string-delete #\. version) ".zip")
+ (string-append
+ "http://simh.trailing-edge.com/sources/archive/simhv"
+ (string-delete #\. version) ".zip")))
(sha256
- (base32 "1jiq6shj6a9xvzacvmyhxxd6xdyica8q4006qqjh5mh96rxrp15c"))
- (file-name (git-file-name name version))))
+ (base32 "1i78c1x8xjiwy9dd2ss0mk3f1v9pmcjb4zc37ikqnjarsfqj2nm0"))))
(build-system gnu-build-system)
+ (native-inputs
+ (list unzip))
(inputs
(list libpcap))
(arguments
- '(#:tests? #f
+ `(#:tests? #f
#:make-flags (list
- "LDFLAGS=-lm"
- (string-append "INCPATH="
- (assoc-ref %build-inputs "libpcap")
- "/include")
- (string-append "LIBPATH="
- (assoc-ref %build-inputs "libpcap")
- "/lib"))
+ (string-append "GCC=" ,(cc-for-target) " -fcommon"))
+ #:modules ((ice-9 string-fun)
+ ,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-before 'build 'prepare-build
(lambda _
+ (substitute* "makefile"
+ (("LIBPATH:=/usr/lib")
+ (string-append "LIBPATH:="
+ (string-replace-substring
+ (getenv "LIBRARY_PATH") ":" " ")))
+ (("export LIBRARY_PATH = .*") ""))
(mkdir "BIN")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7
--
2.41.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#65681; Package
guix-patches.
(Fri, 01 Sep 2023 14:53:02 GMT)
Full text and
rfc822 format available.
Message #8 received at 65681 <at> debbugs.gnu.org (full text, mbox):
From: 宋文武 <iyzsong <at> member.fsf.org>
* gnu/packages/simh.scm (simh)[arguments]: Convert to list of G-Expressions.
---
gnu/packages/simh.scm | 70 +++++++++++++++++++++----------------------
1 file changed, 35 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/simh.scm b/gnu/packages/simh.scm
index 2cf92516ba..9f5c04d8fb 100644
--- a/gnu/packages/simh.scm
+++ b/gnu/packages/simh.scm
@@ -19,6 +19,7 @@
(define-module (gnu packages simh)
#:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix git-download)
@@ -48,41 +49,40 @@ (define-public simh
(inputs
(list libpcap))
(arguments
- `(#:tests? #f
- #:make-flags (list
- (string-append "GCC=" ,(cc-for-target) " -fcommon"))
- #:modules ((ice-9 string-fun)
- ,@%gnu-build-system-modules)
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'prepare-build
- (lambda _
- (substitute* "makefile"
- (("LIBPATH:=/usr/lib")
- (string-append "LIBPATH:="
- (string-replace-substring
- (getenv "LIBRARY_PATH") ":" " ")))
- (("export LIBRARY_PATH = .*") ""))
- (mkdir "BIN")))
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (bin (string-append out "/bin/"))
- (lib (string-append out "/lib/simh/")))
- (mkdir-p bin)
- (mkdir-p lib)
- (for-each
- (lambda (file)
- (copy-file file (string-append bin
- "simh-"
- (basename file))))
- (find-files "BIN"))
- (for-each
- (lambda (file)
- (copy-file file (string-append lib
- (basename file))))
- (find-files "VAX" "bin$"))))))))
+ (list #:tests? #f
+ #:make-flags
+ #~(list (string-append "GCC=" #$(cc-for-target) " -fcommon"))
+ #:modules `((ice-9 string-fun)
+ ,@%gnu-build-system-modules)
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure)
+ (add-before 'build 'prepare-build
+ (lambda _
+ (substitute* "makefile"
+ (("LIBPATH:=/usr/lib")
+ (string-append "LIBPATH:="
+ (string-replace-substring
+ (getenv "LIBRARY_PATH") ":" " ")))
+ (("export LIBRARY_PATH = .*") ""))
+ (mkdir "BIN")))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/"))
+ (lib (string-append out "/lib/simh/")))
+ (mkdir-p bin)
+ (mkdir-p lib)
+ (for-each (lambda (file)
+ (copy-file file
+ (string-append bin "simh-"
+ (basename file))))
+ (find-files "BIN"))
+ (for-each (lambda (file)
+ (copy-file file
+ (string-append lib
+ (basename file))))
+ (find-files "VAX" "bin$"))))))))
(home-page "http://simh.trailing-edge.com")
(synopsis "Collection of simulators from The Computer History Simulation
Project")
--
2.41.0
Reply sent
to
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:
You have taken responsibility.
(Wed, 06 Sep 2023 00:52:05 GMT)
Full text and
rfc822 format available.
Notification sent
to
iyzsong <at> envs.net:
bug acknowledged by developer.
(Wed, 06 Sep 2023 00:52:05 GMT)
Full text and
rfc822 format available.
Message #13 received at 65681-done <at> debbugs.gnu.org (full text, mbox):
Hi,
Series installed :-).
--
Thanks,
Maxim
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Wed, 04 Oct 2023 11:24:39 GMT)
Full text and
rfc822 format available.
This bug report was last modified 1 year and 220 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.