[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
18/40: gnu: simh: Update to 3.12-4.
From: |
guix-commits |
Subject: |
18/40: gnu: simh: Update to 3.12-4. |
Date: |
Tue, 5 Sep 2023 20:02:18 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit 35c254e5fdf3f0c15f667bbb3f312db99bf0c2dd
Author: 宋文武 <iyzsong@member.fsf.org>
AuthorDate: Fri Sep 1 22:51:02 2023 +0800
gnu: simh: Update to 3.12-4.
* gnu/packages/simh.scm (simh): Update to 3.12-4.
[source]: Switch to url-fetch.
[native-inputs]: Add unzip.
[arguments]: Adjust make-flags.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
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 @@
#: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)
- 05/40: gnu: highlight: Update to 4.8., (continued)
- 05/40: gnu: highlight: Update to 4.8., guix-commits, 2023/09/05
- 01/40: gnu: ungoogled-chromium-wayland: Use gexp., guix-commits, 2023/09/05
- 14/40: gnu: sideload: Update to 6.2.1., guix-commits, 2023/09/05
- 06/40: gnu: Add fonts-tlwg., guix-commits, 2023/09/05
- 15/40: gnu: kaidan: Add missing input., guix-commits, 2023/09/05
- 19/40: gnu: simh: Use G-Expressions., guix-commits, 2023/09/05
- 34/40: gnu: ardour: Build locales., guix-commits, 2023/09/05
- 29/40: gnu: arcan: Build all features., guix-commits, 2023/09/05
- 32/40: gnu: arcan: Restyle format., guix-commits, 2023/09/05
- 38/40: gnu: python-skia-pathops: Update to 0.8.0., guix-commits, 2023/09/05
- 18/40: gnu: simh: Update to 3.12-4.,
guix-commits <=
- 39/40: Revert "guix: git: Avoid touching the network unless needed in 'reference-available?'.", guix-commits, 2023/09/05
- 27/40: gnu: xarcan: Fix indentation., guix-commits, 2023/09/05
- 36/40: gnu: skia: Update to 110.0.0f3fb7a., guix-commits, 2023/09/05
- 26/40: gnu: xarcan: Update to 0.6.1., guix-commits, 2023/09/05
- 35/40: gnu-maintenance: Do not crash on refresh when origin URI is a list., guix-commits, 2023/09/05
- 28/40: gnu: arcan: Update to 0.6.2.1., guix-commits, 2023/09/05
- 04/40: gnu: dosbox-staging: Update to 0.80.1., guix-commits, 2023/09/05
- 02/40: gnu: mpd: Remove unused imports., guix-commits, 2023/09/05
- 13/40: gnu: pantheon-calculator: Update to 2.0.2., guix-commits, 2023/09/05
- 11/40: gnu: ibus: Add search-path for 'GUIX_GTK3_IM_MODULE_FILE'., guix-commits, 2023/09/05