janneke pushed a commit to branch wip-bootstrap in repository guix. commit 930e4f9f5296e4e294e9fb179945e215bef9fb02 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Dec 2 15:14:57 2017 +0100
gnu: Update mescc-tools-boot, mes-boot, tcc-boot for blood-elf. * gnu/packages/mes.scm (%mescc-tools-seed, %mes-seed, %tinycc-seed, %srfi-43): New variable. Update versions to blood-elf build. * gnu/packages/mes.scm (mescc-tools-boot): Update to 0.3+. (mes-boot): Update to blood-elf build. (tcc-boot): Update to blood-elf build. --- gnu/packages/mes.scm | 120 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 61 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 45f329f..5b91530 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -39,6 +39,48 @@ #:use-module (guix licenses) #:use-module (guix packages)) +(define %mescc-tools-seed + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" + "/repository/archive.tar.gz?ref=" + "a4aa5dd0a2f1b452c864dbe5aadd70875a58e225")) + (file-name (string-append "mescc-tools-seed" "-" "0.3" ".tar.xz")) + (sha256 + (base32 + "1wb2g4w5238ndkihyjxg7wbk1cfrkg4hy662lhr4jqglnq0d8bb2")))) + +(define %mes-seed + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes-seed" + "/repository/archive.tar.gz?ref=" + "1cb607a8d8318a1b3492a419df0f52c24f1b3233")) + (file-name (string-append "mes-seed-0.11" ".tar.xz")) + (sha256 + (base32 + "1a1yhmvyyynvmx9q7s97jfpb6k2yh2gjyzq4cd3xwzmvah3jv6b5")))) + +(define %tinycc-seed + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed" + "/repository/archive.tar.gz?ref=" + "8c6048e4face831acff54dc9b97f5053f07b2160")) + (file-name (string-append "tinycc-seed" "-" "0.9.26" ".tar.xz")) + (sha256 + (base32 + "0p36gb61mai9a8khh9hbjjzwqp3bmkdi57qccg1w0wmr7vvidnf7")))) + +(define %srfi-43 + (origin + (method url-fetch) + (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") + (file-name "srfi-43.scm") + (sha256 + (base32 + "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) + (define-public stage0-boot (let ((version "0.0.8") (revision "0") @@ -113,9 +155,9 @@ with a Knight VM that runs Forth and Lisp.") (license gpl3+)))) (define-public mescc-tools-boot - (let ((version "0.2") + (let ((version "0.3") (revision "0") - (commit "ba44d19a830d03bc87a24241a268ae097b654f3d")) + (commit "587a4b4c5d2fcda836272b613c802e8ca9c55523")) (package-with-bootstrap-guile (package (name "mescc-tools-boot") @@ -129,34 +171,16 @@ with a Knight VM that runs Forth and Lisp.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0dcvlacks67ks9ibzcqhq82fg0j2g69cxznb6xl5c99m1qrdvl57")))) + "0kh4a9hvhhxgxqx2j5gz6s20mdwp5a121pncyi2g8ixn12wbp92v")))) (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))) ("stage0" ,stage0-boot) - ("mescc-tools-seed" - ,(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" - "/repository/archive.tar.gz?ref=" - "f59808fc39ddd9ca7dc044b378155dcbb0cca337")) - (file-name (string-append "mescc-tools-seed" "-" version ".tar.xz")) - (sha256 - (base32 - "0rn08hw6r6q9lqp2vlmy0p1jyfwfz81zfpdg09dsc5hzj7s4gar4")))) + ("mescc-tools-seed" ,%mescc-tools-seed) ("mes-source" ,(package-source mes-boot)) - ("mes-seed" - ,(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/repository/archive.tar.gz?ref=" - "12dc81d9e4bc247abfa1d2072497b0b1a4b0d8c3")) - (file-name (string-append "mes-seed-0.11" ".tar.xz")) - (sha256 - (base32 - "0pk5fx95kd8g0kamqcgqd0l7ygiw6g5lbxsg16g2aj65381sr97g")))))) + ("mes-seed" ,%mes-seed))) (supported-systems '("i686-linux" "x86_64-linux")) (build-system trivial-build-system) (arguments @@ -204,7 +228,7 @@ hex2 linker.") (define-public mes-boot (let ((version "0.11") (revision "0") - (commit "7bb64cbfd2dbea9fd4146ff6bc0c56925af14ad7")) + (commit "dde712814b7ce076278f0ef161a2ff70a80116f1")) (package-with-bootstrap-guile (package (name "mes-boot") @@ -218,7 +242,7 @@ hex2 linker.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0i8x3501yi5glf56krfpra5854drm43231hiidxavq4hasnfn77j")))) + "0ncq3zw3qcdrjgr08qkgrm24azrx1yck3200spj0j9jigl8l4yc5")))) (build-system trivial-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs @@ -226,27 +250,12 @@ hex2 linker.") ("bash" ,(search-bootstrap-binary "bash" (%current-system))) ("guile" ,%bootstrap-guile) ;; guile-2.0.9 does not have srfi-43; cherry-pick - ("srfi-43" ,(origin - (method url-fetch) - (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") - (file-name "srfi-43.scm") - (sha256 - (base32 - "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) + ("srfi-43" ,%srfi-43) ("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) ("mescc-tools" ,mescc-tools-boot) ("nyacc-source" ,(package-source nyacc-boot)) - ("mes-seed" - ,(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/repository/archive.tar.gz?ref=" - "12dc81d9e4bc247abfa1d2072497b0b1a4b0d8c3")) - (file-name (string-append "mes-seed-0.11" ".tar.xz")) - (sha256 - (base32 - "0pk5fx95kd8g0kamqcgqd0l7ygiw6g5lbxsg16g2aj65381sr97g")))))) + ("mes-seed" ,%mes-seed))) (arguments `(#:modules ((guix build utils)) #:builder @@ -331,7 +340,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public tcc-boot (let ((version "0.9.26") (revision "0") - (commit "8f495f27423acbf569459f517466a07ed2c96c45")) + (commit "1e7584177f07a605c708f1b560b24e21d2736a2a")) (package-with-bootstrap-guile (package (name "tcc-boot") @@ -345,35 +354,21 @@ extensive examples, including parsers for the Javascript and C99 languages.") (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "15kh9qpc12pph0yz1rz8v646kx9x62a1cqgy0g0y4vbj3sampdsy")))) + "1mi0616zkxjs31bc324ja7n3128gcb3l9ank8g5p62zyp8xnc0wh")))) (build-system trivial-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (native-inputs `(("static-bash" ,@(assoc-ref %bootstrap-inputs "bash")) ("guile" ,%bootstrap-guile) ;; guile-2.0.9 does not have srfi-43; cherry-pick - ("srfi-43" ,(origin - (method url-fetch) - (uri "http://git.savannah.gnu.org/cgit/guile.git/plain/module/srfi/srfi-43.scm?h=stable-2.0") - (file-name "srfi-43.scm") - (sha256 - (base32 - "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) + ("srfi-43" ,%srfi-43) ("tar" ,(search-bootstrap-binary "tar" (%current-system))) ("xz" ,(search-bootstrap-binary "xz" (%current-system))) ("mes" ,mes-boot) + ("mes-seed" ,%mes-seed) ("mescc-tools" ,mescc-tools-boot) ("nyacc-source" ,(package-source nyacc-boot)) - ("tinycc-seed" - ,(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed" - "/repository/archive.tar.gz?ref=" - "393a3117a91ec057494986bd75215e1a1786d69d")) - (file-name (string-append name "-seed" "-" version ".tar.xz")) - (sha256 - (base32 - "0ipb59my9hxkaybvj8bss5chqs2ypga3k765l93z374p57cqmllm")))))) + ("tinycc-seed" ,%tinycc-seed))) (arguments `(#:modules ((guix build utils)) #:builder @@ -388,6 +383,7 @@ extensive examples, including parsers for the Javascript and C99 languages.") (xz (assoc-ref %build-inputs "xz")) (source (assoc-ref %build-inputs "source")) (nyacc-source (assoc-ref %build-inputs "nyacc-source")) + (mes-seed (assoc-ref %build-inputs "mes-seed")) (tinycc-seed (assoc-ref %build-inputs "tinycc-seed")) (out (assoc-ref %outputs "out")) (dir (getcwd))) @@ -402,6 +398,8 @@ extensive examples, including parsers for the Javascript and C99 languages.") (system* "tar" "--strip=1" "-C" "source" "-xvf" source) (mkdir-p "nyacc-source") (system* "tar" "--strip=1" "-C" "nyacc-source" "-xvf" nyacc-source) + (mkdir-p "mes-seed") + (system* "tar" "--strip=1" "-C" "mes-seed" "-xvf" mes-seed) (mkdir-p "tinycc-seed") (system* "tar" "--strip=1" "-C" "tinycc-seed" "-xvf" tinycc-seed) (mkdir-p "srfi")