* [bug#62324] gnu: Add emu8051
@ 2023-03-21 7:20 c4droid
2023-03-21 13:43 ` Bruno Victal
` (5 more replies)
0 siblings, 6 replies; 13+ messages in thread
From: c4droid @ 2023-03-21 7:20 UTC (permalink / raw)
To: 62324
[-- Attachment #1: emu8051 definition --]
[-- Type: text/x-patch, Size: 2806 bytes --]
From 351280951b0ad515dc6b725dca51a986def1f93f Mon Sep 17 00:00:00 2001
From: c4droid <c4droid@foxmail.com>
Date: Tue, 21 Mar 2023 15:16:10 +0800
Subject: [PATCH] gnu: Add emu8051.
* gnu/packages/embedded.scm (emu8051): New variable.
---
gnu/packages/embedded.scm | 41 +++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 8d854c7..50658e4 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1747,3 +1748,43 @@ (define-public ts4900-utils
@item tssilomon
@end itemize")
(license license:bsd-2))))
+
+(define-public emu8051
+ (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8")
+ (revision "1"))
+ (package
+ (name "emu8051")
+ (version (git-version "0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jarikomppa/emu8051")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f ;No test suite
+ #:make-flags (list (string-append "CC="
+ ,(cc-for-target)))
+ #:phases (modify-phases %standard-phases
+ (delete 'configure) ;No ./configure script
+ (add-before 'build 'patch-ncurses
+ ;; Replace LDFLAGS -lcurses to -lncurses
+ (lambda* _
+ (substitute* "Makefile"
+ (("-lcurses")
+ "-lncurses"))))
+ (replace 'install
+ ;; No installation procedure
+ (lambda _
+ (install-file "emu"
+ (string-append (assoc-ref %outputs "out")
+ "/bin")))))))
+ (inputs (list ncurses))
+ (home-page "https://github.comjarikomppa/emu8051")
+ (synopsis "8051/8052 emulator with curses-based UI")
+ (description "emu8051 is a simulator of the 8051/8052 microcontrollers.")
+ (license license:expat))))
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [bug#62324] gnu: Add emu8051
2023-03-21 7:20 [bug#62324] gnu: Add emu8051 c4droid
@ 2023-03-21 13:43 ` Bruno Victal
[not found] ` <87ttydbo5c.fsf@foxmail.com>
[not found] ` <87h6udo8ml.fsf@foxmail.com>
2023-03-21 14:47 ` Simon South
` (4 subsequent siblings)
5 siblings, 2 replies; 13+ messages in thread
From: Bruno Victal @ 2023-03-21 13:43 UTC (permalink / raw)
To: c4droid; +Cc: 62324
Hi,
On 2023-03-21 07:20, c4droid wrote:
>
> + (arguments
> + `(#:tests? #f ;No test suite
> + #:make-flags (list (string-append "CC="
> + ,(cc-for-target)))
> + #:phases (modify-phases %standard-phases
> + (delete 'configure) ;No ./configure script
> + (add-before 'build 'patch-ncurses
> + ;; Replace LDFLAGS -lcurses to -lncurses
> + (lambda* _
> + (substitute* "Makefile"
> + (("-lcurses")
> + "-lncurses"))))
How about turning this 'patch-ncurses phase into a patch snippet instead? i.e.
(source
(origin
(method ...)
...
(modules '((guix build utils)))
(snippet
#~(begin
;; Replace LDFLAGS -lcurses to -lncurses
(substitute* "Makefile"
(("-lcurses") "-lncurses"))))))
[...]
> + (replace 'install
> + ;; No installation procedure
> + (lambda _
> + (install-file "emu"
> + (string-append (assoc-ref %outputs "out")
> + "/bin")))))))
Use G-Expressions here, i.e.
(arguments
(list
#:tests? #f ;No test suite
#:make-flags #~(list ...)
#:phases
#~(modify-phases ...
...
(replace 'install
(lambda _
(install-file "emu" (string-append #$output "/bin")))))))
Cheers,
Bruno
^ permalink raw reply [flat|nested] 13+ messages in thread* [bug#62324] gnu: Add emu8051
2023-03-21 7:20 [bug#62324] gnu: Add emu8051 c4droid
2023-03-21 13:43 ` Bruno Victal
@ 2023-03-21 14:47 ` Simon South
[not found] ` <87pm91bo2u.fsf@foxmail.com>
[not found] ` <87cz51o841.fsf@foxmail.com>
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Simon South @ 2023-03-21 14:47 UTC (permalink / raw)
To: c4droid; +Cc: 62324
c4droid <c4droid@foxmail.com> writes:
> (home-page "https://github.comjarikomppa/emu8051")
This URL appears to be missing a forward slash.
--
Simon South
simon@simonsouth.net
^ permalink raw reply [flat|nested] 13+ messages in thread[parent not found: <87cz51o841.fsf@foxmail.com>]
* [bug#62324] [PATCH 0/1] gnu: emu8051: Using snippet to replace patch-ncurses phases
[not found] ` <87cz51o841.fsf@foxmail.com>
@ 2023-03-22 1:58 ` c4droid
2023-03-22 2:13 ` Bruno Victal
0 siblings, 1 reply; 13+ messages in thread
From: c4droid @ 2023-03-22 1:58 UTC (permalink / raw)
To: 62324
[-- Attachment #1: Type: text/plain, Size: 50 bytes --]
Replace patch-ncurses phases with snippet field.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emu8051-Using-snippet-to-replace-patch-ncurses-p.patch --]
[-- Type: text/x-patch, Size: 2678 bytes --]
From 8f4aeb1d2f99b87ced20242cff6ed282649243d4 Mon Sep 17 00:00:00 2001
From: c4droid <c4droid@foxmail.com>
Date: Wed, 22 Mar 2023 09:57:13 +0800
Subject: [PATCH] gnu: emu8051: Using snippet to replace patch-ncurses phases
---
gnu/packages/embedded.scm | 35 +++++++++++++++++------------------
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 50658e4..fdf950f 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1763,28 +1763,27 @@ (define-public emu8051
(file-name (git-file-name name version))
(sha256
(base32
- "1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))))
+ "1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; Replace LDFLAGS -lcurses to -lncurses
+ (substitute* "Makefile"
+ (("-lcurses") "-lncurses"))))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;No test suite
- #:make-flags (list (string-append "CC="
- ,(cc-for-target)))
- #:phases (modify-phases %standard-phases
- (delete 'configure) ;No ./configure script
- (add-before 'build 'patch-ncurses
- ;; Replace LDFLAGS -lcurses to -lncurses
- (lambda* _
- (substitute* "Makefile"
- (("-lcurses")
- "-lncurses"))))
- (replace 'install
- ;; No installation procedure
- (lambda _
- (install-file "emu"
- (string-append (assoc-ref %outputs "out")
- "/bin")))))))
+ #:make-flags #~(list (string-append "CC="
+ ,(cc-for-target)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;No ./configure script
+ (replace 'install
+ ;; No installation procedure
+ (lambda _
+ (install-file "emu"
+ (string-append #$output "/bin")))))))
(inputs (list ncurses))
- (home-page "https://github.comjarikomppa/emu8051")
+ (home-page "https://github.com/jarikomppa/emu8051")
(synopsis "8051/8052 emulator with curses-based UI")
(description "emu8051 is a simulator of the 8051/8052 microcontrollers.")
(license license:expat))))
--
2.39.2
[-- Attachment #3: Type: text/plain, Size: 73 bytes --]
When changing install phases with gexp, report: Unbound variables: gexp
^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <87pm91dyam.fsf@foxmail.com>]
* [bug#62324] [PATCH 1/1] gnu: emu8051: Fix build error for quasiquote
[not found] ` <87pm91dyam.fsf@foxmail.com>
@ 2023-03-22 7:43 ` c4droid
2023-03-30 12:48 ` [bug#62324] gnu: Add emu8051 宋文武 via Guix-patches via
0 siblings, 1 reply; 13+ messages in thread
From: c4droid @ 2023-03-22 7:43 UTC (permalink / raw)
To: 62324
[-- Attachment #1: Type: text/plain, Size: 74 bytes --]
Here is final patch for emu8051 packages, it fix previous patches error.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-emu8051-Fix-build-error-for-quasiquote.patch --]
[-- Type: text/x-patch, Size: 2394 bytes --]
From 83dfc323e2439e6a89079054eb47d439b81d01ce Mon Sep 17 00:00:00 2001
From: c4droid <c4droid@foxmail.com>
Date: Wed, 22 Mar 2023 15:42:09 +0800
Subject: [PATCH] gnu: emu8051: Fix build error for quasiquote
---
gnu/packages/embedded.scm | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index fdf950f..514c20f 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -1764,24 +1764,24 @@ (define-public emu8051
(sha256
(base32
"1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))
- (modules '((guix build utils)))
- (snippet
- #~(begin
- ;; Replace LDFLAGS -lcurses to -lncurses
- (substitute* "Makefile"
- (("-lcurses") "-lncurses"))))))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ ;; Replace LDFLAGS -lcurses to -lncurses
+ (substitute* "Makefile"
+ (("-lcurses")
+ "-lncurses"))))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ;No test suite
- #:make-flags #~(list (string-append "CC="
- ,(cc-for-target)))
- #:phases #~(modify-phases %standard-phases
- (delete 'configure) ;No ./configure script
- (replace 'install
- ;; No installation procedure
- (lambda _
- (install-file "emu"
- (string-append #$output "/bin")))))))
+ (list #:tests? #f ;No test suite
+ #:make-flags #~(list (string-append "CC="
+ #$(cc-for-target)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;No ./configure script
+ (replace 'install
+ ;; No installation procedure
+ (lambda _
+ (install-file "emu"
+ (string-append #$output "/bin")))))))
(inputs (list ncurses))
(home-page "https://github.com/jarikomppa/emu8051")
(synopsis "8051/8052 emulator with curses-based UI")
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <87fs9l2z6g.fsf@foxmail.com>]
* [bug#62324] [PATCH] gnu: Add emu8051.
[not found] ` <87fs9l2z6g.fsf@foxmail.com>
@ 2023-03-31 6:48 ` c4droid
2023-03-31 11:33 ` bug#62324: " 宋文武 via Guix-patches via
0 siblings, 1 reply; 13+ messages in thread
From: c4droid @ 2023-03-31 6:48 UTC (permalink / raw)
To: 62324
[-- Attachment #1: 0001-PATCH-gnu-Add-emu8051.patch --]
[-- Type: text/x-patch, Size: 2729 bytes --]
From a9f8f4e71dc5270ab7cbfd6da74a3fc7b304e5b6 Mon Sep 17 00:00:00 2001
From: c4droid <c4droid@foxmail.com>
Date: Fri, 31 Mar 2023 14:46:50 +0800
Subject: [PATCH] [PATCH] gnu: Add emu8051.
---
gnu/packages/embedded.scm | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm
index 8d854c7..653e02a 100644
--- a/gnu/packages/embedded.scm
+++ b/gnu/packages/embedded.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
;;; Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1747,3 +1748,41 @@ (define-public ts4900-utils
@item tssilomon
@end itemize")
(license license:bsd-2))))
+
+(define-public emu8051
+ (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8")
+ (revision "1"))
+ (package
+ (name "emu8051")
+ (version (git-version "0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jarikomppa/emu8051")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ ;; Replace LDFLAGS -lcurses to -lncurses
+ (substitute* "Makefile"
+ (("-lcurses") "-lncurses"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;No test suite
+ #:make-flags #~(list (string-append "CC="
+ #$(cc-for-target)))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure) ;No ./configure script
+ (replace 'install
+ ;; No installation procedure
+ (lambda _
+ (install-file "emu"
+ (string-append #$output "/bin")))))))
+ (inputs (list ncurses))
+ (home-page "https://github.comjarikomppa/emu8051")
+ (synopsis "8051/8052 emulator with curses-based UI")
+ (description "emu8051 is a simulator of the 8051/8052 microcontrollers.")
+ (license license:expat))))
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* bug#62324: gnu: Add emu8051
2023-03-31 6:48 ` [bug#62324] [PATCH] " c4droid
@ 2023-03-31 11:33 ` 宋文武 via Guix-patches via
0 siblings, 0 replies; 13+ messages in thread
From: 宋文武 via Guix-patches via @ 2023-03-31 11:33 UTC (permalink / raw)
To: c4droid; +Cc: 62324-done
c4droid <c4droid@foxmail.com> writes:
>>From a9f8f4e71dc5270ab7cbfd6da74a3fc7b304e5b6 Mon Sep 17 00:00:00 2001
> From: c4droid <c4droid@foxmail.com>
> Date: Fri, 31 Mar 2023 14:46:50 +0800
> Subject: [PATCH] [PATCH] gnu: Add emu8051.
>
> ---
> gnu/packages/embedded.scm | 39 +++++++++++++++++++++++++++++++++++++++
> 1 file changed, 39 insertions(+)
Hello, I think emu8051 should go to emulators.scm, it seems embedded.scm
are for tools working with real hardwares, while emulators.scm has
similiar packages like qtmips.
I have send an updated patch to move it into emulators.scm, also fixed
home-page, and add commit message for file changes:
* gnu/packages/emulator.scm (emu8051): New variable.
Though I just nocited it should be emulators.scm (emu8051)..
Well, I decide to push now, thank you for the patch and reviewers for
the feedbacks!
^ permalink raw reply [flat|nested] 13+ messages in thread
* [bug#62324] [PATCH v2] gnu: Add emu8051.
2023-03-21 7:20 [bug#62324] gnu: Add emu8051 c4droid
` (4 preceding siblings ...)
[not found] ` <87fs9l2z6g.fsf@foxmail.com>
@ 2023-03-31 11:22 ` iyzsong--- via Guix-patches via
5 siblings, 0 replies; 13+ messages in thread
From: iyzsong--- via Guix-patches via @ 2023-03-31 11:22 UTC (permalink / raw)
To: 62324; +Cc: 宋文武, c4droid
From: c4droid <c4droid@foxmail.com>
* gnu/packages/emulator.scm (emu8051): New variable.
Reviewed-by: 宋文武 <iyzsong@member.fsf.org>
---
gnu/packages/emulators.scm | 40 ++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 166c3b4ec6..7e73b217ea 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -17,6 +17,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2023 c4droid <c4droid@foxmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2580,3 +2581,42 @@ (define-public uxn
"This package provides an assembler and emulator for the Uxn
stack-machine, written in ANSI C. Graphical output is implemented using SDL2.")
(license license:expat))))
+
+(define-public emu8051
+ (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8")
+ (revision "1"))
+ (package
+ (name "emu8051")
+ (version (git-version "0.1" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/jarikomppa/emu8051")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1xxmkcwvd5fjnhwbricafg4xvxvr8dxhfanyfp4rbksw37dgk2fx"))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ ;; Replace LDFLAGS -lcurses to -lncurses
+ (substitute* "Makefile"
+ (("-lcurses") "-lncurses"))))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ;No test suite
+ #:make-flags #~(list (string-append "CC="
+ #$(cc-for-target)))
+ #:phases
+ #~(modify-phases %standard-phases
+ (delete 'configure) ;No ./configure script
+ (replace 'install
+ ;; No installation procedure
+ (lambda _
+ (install-file "emu"
+ (string-append #$output "/bin")))))))
+ (inputs (list ncurses))
+ (home-page "https://github.com/jarikomppa/emu8051")
+ (synopsis "8051/8052 emulator with curses-based UI")
+ (description "emu8051 is a simulator of the 8051/8052 microcontrollers.")
+ (license license:expat))))
--
2.39.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-03-31 11:34 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-21 7:20 [bug#62324] gnu: Add emu8051 c4droid
2023-03-21 13:43 ` Bruno Victal
[not found] ` <87ttydbo5c.fsf@foxmail.com>
2023-03-22 0:53 ` c4droid
[not found] ` <87h6udo8ml.fsf@foxmail.com>
2023-03-22 1:48 ` c4droid
2023-03-21 14:47 ` Simon South
[not found] ` <87pm91bo2u.fsf@foxmail.com>
2023-03-22 0:56 ` c4droid
[not found] ` <87cz51o841.fsf@foxmail.com>
2023-03-22 1:58 ` [bug#62324] [PATCH 0/1] gnu: emu8051: Using snippet to replace patch-ncurses phases c4droid
2023-03-22 2:13 ` Bruno Victal
[not found] ` <87pm91dyam.fsf@foxmail.com>
2023-03-22 7:43 ` [bug#62324] [PATCH 1/1] gnu: emu8051: Fix build error for quasiquote c4droid
2023-03-30 12:48 ` [bug#62324] gnu: Add emu8051 宋文武 via Guix-patches via
[not found] ` <87fs9l2z6g.fsf@foxmail.com>
2023-03-31 6:48 ` [bug#62324] [PATCH] " c4droid
2023-03-31 11:33 ` bug#62324: " 宋文武 via Guix-patches via
2023-03-31 11:22 ` [bug#62324] [PATCH v2] " iyzsong--- via Guix-patches via
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).