[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
56/163: gnu: mescc-tools-boot: Update for mes 0.15.
From: |
Jan Nieuwenhuizen |
Subject: |
56/163: gnu: mescc-tools-boot: Update for mes 0.15. |
Date: |
Thu, 30 Aug 2018 01:03:21 -0400 (EDT) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 32e0c6f6aad805f172f2ba65418e32b5a33a0077
Author: Jan Nieuwenhuizen <address@hidden>
Date: Wed May 30 18:15:12 2018 +0200
gnu: mescc-tools-boot: Update for mes 0.15.
* gnu/packages/mes.scm (mescc-tools-boot): Update for mes 0.15.
---
gnu/packages/mes.scm | 130 ++++++++++++++++++++++++++-------------------------
1 file changed, 66 insertions(+), 64 deletions(-)
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm
index 650469a..32e52ba 100644
--- a/gnu/packages/mes.scm
+++ b/gnu/packages/mes.scm
@@ -153,72 +153,74 @@ with a Knight VM that runs Forth and Lisp.")
(license gpl3+))))
(define-public mescc-tools-boot
- (package-with-bootstrap-guile
- (package
- (name "mescc-tools-boot")
- (version "0.4")
- (synopsis "Tools for the full source bootstrapping process")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/oriansj/mescc-tools/archive/Release_"
- version
- ".tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
- (sha256
- (base32
- "1iwc8xqwzdaqckb4jkkisljrgn8ii4bl7dzk1l2kpv98hsyq9vi1"))))
- (native-inputs
- `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
- ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
- ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
- ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
- ("mescc-tools-seed" ,%mescc-tools-seed)
- ("mes-source" ,(package-source mes-boot))
- ("mes-seed" ,%mes-seed)))
- (supported-systems '("i686-linux" "x86_64-linux"))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "static-bash"))
- (tar (assoc-ref %build-inputs "tar"))
- (xz (assoc-ref %build-inputs "xz"))
- (source (assoc-ref %build-inputs "source"))
- (mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
- (mes-seed (assoc-ref %build-inputs "mes-seed"))
- (mes-source (assoc-ref %build-inputs "mes-source"))
- (out (assoc-ref %outputs "out"))
- (out/bin (string-append out "/bin")))
- (setenv "PATH" (string-append bash "/bin:"
- "../mescc-tools-seed:"
- tar "/bin:"
- xz "/bin"))
- (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
- (mkdir-p "source")
- (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
- (mkdir-p "mescc-tools-seed")
- (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf"
mescc-tools-seed)
- (mkdir-p "mes-source")
- (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
- (mkdir-p "mes-seed")
- (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
- (chdir "source")
- (setenv "PREFIX" out)
- (setenv "MES_PREFIX" "../mes-source")
- (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
- (setenv "MES_SEED" "../mes-seed")
- (and (zero? (system* "sh" "build.sh"))
- (zero? (system* "sh" "check.sh"))
- (zero? (system* "sh" "install.sh")))))))
- (description
- "Mescc-tools is a collection of tools for use in a full source
+ (let ((version "0.4")
+ (revision "0")
+ (commit "9cbee90b4265d085c751ce2ce63fd8e972148638"))
+ (package-with-bootstrap-guile
+ (package
+ (name "mescc-tools-boot")
+ (version (string-append version "-" revision "." (string-take commit
7)))
+ (synopsis "Tools for the full source bootstrapping process")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://gitlab.com/janneke/mescc-tools"
+ "/-/archive/" commit
+ "/mescc-tools-" commit ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1ah9f2f45mnb695wsh16rz3y92w6mz99z7y4basln3ba0gc7l7nh"))))
+ (native-inputs
+ `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash"))
+ ("bash" ,(search-bootstrap-binary "bash" (%current-system)))
+ ("tar" ,(search-bootstrap-binary "tar" (%current-system)))
+ ("xz" ,(search-bootstrap-binary "xz" (%current-system)))
+ ("mescc-tools-seed" ,%mescc-tools-seed)
+ ("mes-source" ,(package-source mes-boot))
+ ("mes-seed" ,%mes-seed)))
+ (supported-systems '("i686-linux" "x86_64-linux"))
+ (build-system trivial-build-system)
+ (arguments
+ `(#:modules ((guix build utils))
+ #:builder
+ (begin
+ (use-modules (guix build utils))
+ (let* ((bash (assoc-ref %build-inputs "static-bash"))
+ (tar (assoc-ref %build-inputs "tar"))
+ (xz (assoc-ref %build-inputs "xz"))
+ (source (assoc-ref %build-inputs "source"))
+ (mescc-tools-seed (assoc-ref %build-inputs
"mescc-tools-seed"))
+ (mes-seed (assoc-ref %build-inputs "mes-seed"))
+ (mes-source (assoc-ref %build-inputs "mes-source"))
+ (out (assoc-ref %outputs "out"))
+ (out/bin (string-append out "/bin")))
+ (setenv "PATH" (string-append bash "/bin:"
+ "../mescc-tools-seed:"
+ tar "/bin:"
+ xz "/bin"))
+ (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
+ (mkdir-p "source")
+ (system* "tar" "--strip=1" "-C" "source" "-xvf" source)
+ (mkdir-p "mescc-tools-seed")
+ (system* "tar" "--strip=1" "-C" "mescc-tools-seed" "-xvf"
mescc-tools-seed)
+ (mkdir-p "mes-source")
+ (system* "tar" "--strip=1" "-C" "mes-source" "-xvf" mes-source)
+ (mkdir-p "mes-seed")
+ (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed)
+ (chdir "source")
+ (setenv "PREFIX" out)
+ (setenv "MES_PREFIX" "../mes-source")
+ (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
+ (setenv "MES_SEED" "../mes-seed")
+ (and (zero? (system* "sh" "build.sh"))
+ (zero? (system* "sh" "check.sh"))
+ (zero? (system* "sh" "install.sh")))))))
+ (description
+ "Mescc-tools is a collection of tools for use in a full source
bootstrapping process. Currently consists of the M1 macro assembler and the
hex2 linker.")
- (home-page "https://github.com/oriansj/mescc-tools")
- (license gpl3+))))
+ (home-page "https://github.com/oriansj/mescc-tools")
+ (license gpl3+)))))
(define-public mes-boot
(let ((version "0.14")
- 15/163: gnu: tcc-boot: Use bootstrap Guile and simplify., (continued)
- 15/163: gnu: tcc-boot: Use bootstrap Guile and simplify., Jan Nieuwenhuizen, 2018/08/30
- 35/163: gnu: Update mes-boot: M4 support: robustify headers., Jan Nieuwenhuizen, 2018/08/30
- 49/163: gnu: %mes-seed: Update for mes 0.14., Jan Nieuwenhuizen, 2018/08/30
- 47/163: gnu: %tinycc-seed: Update for mes 0.13., Jan Nieuwenhuizen, 2018/08/30
- 46/163: gnu: mes-boot: Update to 0.13., Jan Nieuwenhuizen, 2018/08/30
- 51/163: gnu: %tinycc-seed: Update for mes 0.14., Jan Nieuwenhuizen, 2018/08/30
- 57/163: gnu: %mes-seed: Update for 0.15., Jan Nieuwenhuizen, 2018/08/30
- 59/163: gnu: %tinycc-seed: Update for mes 0.15., Jan Nieuwenhuizen, 2018/08/30
- 54/163: gnu: mescc-tools-boot: Update to 0.4., Jan Nieuwenhuizen, 2018/08/30
- 55/163: gnu: %mescc-tools-seed: Update for 0.15., Jan Nieuwenhuizen, 2018/08/30
- 56/163: gnu: mescc-tools-boot: Update for mes 0.15.,
Jan Nieuwenhuizen <=
- 60/163: gnu: tinycc-boot: Update for mes 0.15., Jan Nieuwenhuizen, 2018/08/30
- 63/163: gnu: binutils-boot: Update to 2.10.1., Jan Nieuwenhuizen, 2018/08/30
- 82/163: Revert "REMOVEME: %fake-bootstrap => #t.", Jan Nieuwenhuizen, 2018/08/30
- 62/163: gnu: Add binutils-boot 2.5.1., Jan Nieuwenhuizen, 2018/08/30
- 81/163: REMOVEME: %fake-bootstrap => #t., Jan Nieuwenhuizen, 2018/08/30
- 75/163: Revert "gnu: gcc-boot: Update to 3.4.0.", Jan Nieuwenhuizen, 2018/08/30
- 85/163: gnu: mes-boot: Update for linux-4.17 elf32-header fix., Jan Nieuwenhuizen, 2018/08/30
- 89/163: gnu: %tinycc-seed: Update for mes 0.16., Jan Nieuwenhuizen, 2018/08/30
- 77/163: Revert "gnu: gcc-boot: Update to 3.0.", Jan Nieuwenhuizen, 2018/08/30
- 94/163: gnu: tcc-boot0: Update for mes 0.16., Jan Nieuwenhuizen, 2018/08/30