janneke pushed a commit to branch wip-bootstrap in repository guix. commit a37c252aad91eb32ca143d915d5396e325cc5096 Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Thu Aug 23 17:31:02 2018 +0200
bootstrap: Move mes seeds to bootstrap.scm * gnu/packages/bootstrap.scm (%mescc-tools-seed): Move from gnu/packages/mes.scm. (%mes-seed): Likewise. (%tinycc-seed): Likewise. (%srfi-43): Likewise. * gnu/packages/mes.scm: Remove them. --- gnu/packages/bootstrap.scm | 48 +++++++++++++++++++++++++++++++++++++++++++++- gnu/packages/mes.scm | 42 ---------------------------------------- 2 files changed, 47 insertions(+), 43 deletions(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index 936d6c1..70d6f13 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -46,7 +46,11 @@ %bootstrap-binutils %bootstrap-gcc %bootstrap-glibc - %bootstrap-inputs)) + %bootstrap-inputs + %mescc-tools-seed + %mes-seed + %srfi-43 + %tinycc-seed)) ;;; Commentary: ;;; @@ -586,6 +590,48 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ (home-page #f) (license gpl3+))) +(define %mescc-tools-seed ; todo: add tarballs to alpha.gnu.org/pub/mes/bootstrap/ + (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" + "/-/archive/" commit + "/mescc-tools-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) + +(define %mes-seed + (let ((commit "9f4b5f3023b9719f6dec61b96cbfc9b327fc7bd8")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/mes-seed" + "/-/archive/" commit + "/mes-seed-" commit ".tar.gz")) + (sha256 + (base32 + "1gyh16bymld897s5zzxd8zj3gqwfgvihblqg6rd177lw176aj821"))))) + +(define %tinycc-seed + (let ((commit "546500b97fb07147add1bc4aef2c10899f6a4306")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/tinycc-seed" + "/-/archive/" commit + "/tinycc-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0803x488jbc2xv68pk633krfxnhyh6k56cmnyiva547m02r0z32h"))))) + +(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 %bootstrap-inputs ;; The initial, pre-built inputs. From now on, we can start building our ;; own packages. diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 4c0a9c8..62857cb 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -46,48 +46,6 @@ (define %fake-bootstrap? #f) ; cheat using Guile instead of Mes for speed-up? -(define %mescc-tools-seed - (let ((commit"29aae8c72e195cbb2f965f05a997b984a4f158fb")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mescc-tools-seed" - "/-/archive/" commit - "/mescc-tools-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0rqip3j2qsppvjvmhhmjqdv70n64q6vkg2p6vpx87h1dbggdjk3v"))))) - -(define %mes-seed - (let ((commit "9f4b5f3023b9719f6dec61b96cbfc9b327fc7bd8")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/mes-seed" - "/-/archive/" commit - "/mes-seed-" commit ".tar.gz")) - (sha256 - (base32 - "1gyh16bymld897s5zzxd8zj3gqwfgvihblqg6rd177lw176aj821"))))) - -(define %tinycc-seed - (let ((commit "546500b97fb07147add1bc4aef2c10899f6a4306")) - (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/tinycc-seed" - "/-/archive/" commit - "/tinycc-seed-" commit ".tar.gz")) - (sha256 - (base32 - "0803x488jbc2xv68pk633krfxnhyh6k56cmnyiva547m02r0z32h"))))) - -(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")