From patchwork Fri Sep 1 14:51:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53364 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 3FD0827BBEA; Fri, 1 Sep 2023 15:52:09 +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,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 2894C27BBE2 for ; Fri, 1 Sep 2023 15:52:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qc5V5-0007wT-6f; Fri, 01 Sep 2023 10:51:55 -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 1qc5V2-0007wE-U3 for guix-patches@gnu.org; Fri, 01 Sep 2023 10:51:52 -0400 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 1qc5V2-0000sI-Ii for guix-patches@gnu.org; Fri, 01 Sep 2023 10:51:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qc5VB-0002Qq-Nt for guix-patches@gnu.org; Fri, 01 Sep 2023 10:52:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65681] [PATCH 1/2] gnu: simh: Update to 3.12-4. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Sep 2023 14:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65681@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16935798739285 (code B ref -1); Fri, 01 Sep 2023 14:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 1 Sep 2023 14:51:13 +0000 Received: from localhost ([127.0.0.1]:33626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5UP-0002Pg-04 for submit@debbugs.gnu.org; Fri, 01 Sep 2023 10:51:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:56660) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5UM-0002PN-Kf for submit@debbugs.gnu.org; Fri, 01 Sep 2023 10:51:11 -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 1qc5U7-0007Or-U3 for guix-patches@gnu.org; Fri, 01 Sep 2023 10:50:55 -0400 Received: from mail.envs.net ([5.199.136.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qc5U2-0000kQ-S4 for guix-patches@gnu.org; Fri, 01 Sep 2023 10:50:55 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 0534338A0132; Fri, 1 Sep 2023 14:50:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693579849; bh=sV5b+4oW8CdEcTAUtRBGBL9DnLBXoogUwityDdSsggA=; h=From:To:Cc:Subject:Date:From; b=BXaLxLAEnRntfXDVByv7etMkiHIDPwYDPzdUNxWXrCKw1132NY5xOP+OghulpMePK uLXFQcVo6e/+JQwxfH9XAnWgomS/s5NAotVAn9nBAZTETHKXTQolZ4v0HNfAa4emA9 hJ0FQIDNVu0mBsOsjvLui2mY0i4iLrisIKn5PQ/W5fQbVjEpbPtsc57UdxWRPX5tAx 1oWDo/lvkWzhwc9oDYnSmSlnSdw6NLBBHePV0klHBSm5XqThdlZefdHb9mqcTaR0fW hdGVWSM2UYijEoIDWy/FRh9H0lujlqqdRdhrKAccj3tJWBUZoOa7fFsLwR5S74rikU 9JXxJ/H5WPL5fIj2mlM7bkAL9b/wSvLNdkmhT6hA6vTj25MjVRKh/LOD65hTI0VQuZ ZVp22xX30QbsqoAEJUk5kXfKijpua9dAxmSgVhJJq5ifIwiVHsqhr08rYd2dHrtRba yokheptRsSupktVQKPE07cbxlAhbDHyZFVR43TR9YLI+uXXq9rVRbrj7s0+5IpvXlq /KiSs+5I6vyjfKWWKVNNG+tqMYN5mhbNu1ucr/q82YDksUDdu2gARBHcAAhir1u+Ef GowUUO4PLzcgOd6/Gaf1YUsC+lXZAHhuJPzQqR7Tp3AKEI/E2D+ikJadgYDIvLvbip /HjzAEywiU6lOh6aIbHbLgIY= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id CsCyprcdaAUM; Fri, 1 Sep 2023 14:50:43 +0000 (UTC) Received: from localhost (unknown [36.170.58.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 1 Sep 2023 14:50:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a4f6372f; Fri, 1 Sep 2023 14:51:10 +0000 (UTC) Date: Fri, 1 Sep 2023 22:51:02 +0800 Message-ID: <37f99d5eea2fc5a389cb3e498e4af8c75b37890b.1693579858.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=5.199.136.28; envelope-from=iyzsong@envs.net; helo=mail.envs.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * 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(-) base-commit: 4e531e55dcdc99c83bcfe3eec67c3fd95c7b6ca7 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) From patchwork Fri Sep 1 14:53:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 53365 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 9D42927BBE9; Fri, 1 Sep 2023 15:53:23 +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,URIBL_BLOCKED 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 4428527BBE2 for ; Fri, 1 Sep 2023 15:53:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qc5W6-00088q-7f; Fri, 01 Sep 2023 10:52:58 -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 1qc5W2-00088Y-NF for guix-patches@gnu.org; Fri, 01 Sep 2023 10:52:54 -0400 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 1qc5W1-00011T-C2 for guix-patches@gnu.org; Fri, 01 Sep 2023 10:52:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qc5WA-0002Sy-Hz for guix-patches@gnu.org; Fri, 01 Sep 2023 10:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65681] [PATCH 2/2] gnu: simh: Use G-Expressions. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Sep 2023 14:53:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65681@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65681-submit@debbugs.gnu.org id=B65681.16935799779457 (code B ref 65681); Fri, 01 Sep 2023 14:53:02 +0000 Received: (at 65681) by debbugs.gnu.org; 1 Sep 2023 14:52:57 +0000 Received: from localhost ([127.0.0.1]:33632 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5W4-0002ST-K3 for submit@debbugs.gnu.org; Fri, 01 Sep 2023 10:52:56 -0400 Received: from mail.envs.net ([5.199.136.28]:34884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc5W2-0002SK-V2 for 65681@debbugs.gnu.org; Fri, 01 Sep 2023 10:52:55 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 2685438A0142; Fri, 1 Sep 2023 14:52:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1693579965; bh=EzjVnpS8LZsIqB2Br6eEfwe7Fgo64m8bpGsWPkx8Iag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W1VxOFKYoZIEujSaNXNcSQ18eh/OShkLoYy/aVbXlx9CCsMYwk5ABQ4uz1rEMdg8y 3qHWSK+rY4IMLfVZ9XR/hSn0GtIERYXIJCKGJ6BlM73PDKbnzd5obNlsgjDL3PSW6o BbLI7yfTqlKnpXcXwdFW+43bW7NZNK8/E3weXrNag9nRKVw9WAN/FJPGFMBtpZ03zW d79C22Q4G9XPTGtqCnzZvy79UT0rxfep6/mM7B8OjhM2k4u27AS53uZvCPD5OlEGhB jPWcCsu8+5q9dUQUUJkEzG2VrKMtJQPxJAIUscs3qc3D7+s+RvyVSzBdaHIGkL6+3h UOOZc5A9ZQv87PckuclwmP4aHaEQvowWA6jU3/5EiQvlLKpuQAPK/+g7yISPwmgyCG +n1LnAA99JoXVubv0iCqerm9JdlLMjpAew292SiQwAnCLWi/HLGq0NC6e7LlsxA3s+ hUYb1D4bjxtCQuKsiLF/f2UpaJg5uQsash1Tdb/USs/iMsLaMxlZiVYbx3rBFJg6Z/ NNcTGEKcgyQqLCGS2jFlYzxz2HGrbmhyU/J+XMEnlkx4kV7RggDZMg78yzOjpNRHnf wV7Zg5q1b7+e62QGlqcqlLWNHuLAmAXwUENBQ66+ozS7Pin+xPRRi4MN4vlYlMvwey 6Huq67skFjE3cIbpAN6A3n0Y= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id clQ5tFVa0EXk; Fri, 1 Sep 2023 14:52:41 +0000 (UTC) Received: from localhost (unknown [36.170.58.199]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 1 Sep 2023 14:52:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2b0b5020; Fri, 1 Sep 2023 14:53:08 +0000 (UTC) Date: Fri, 1 Sep 2023 22:53:06 +0800 Message-ID: <5dcaf8f1d76f5ebac8dfd128c4ad5b465898caa4.1693579858.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <37f99d5eea2fc5a389cb3e498e4af8c75b37890b.1693579858.git.iyzsong@member.fsf.org> References: <37f99d5eea2fc5a389cb3e498e4af8c75b37890b.1693579858.git.iyzsong@member.fsf.org> 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: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * 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")