janneke pushed a commit to branch wip-bootstrap in repository guix. commit ddb01158cf1bb1e8cca96eab8a1c92faea17faaa Author: Jan Nieuwenhuizen <jann...@gnu.org> Date: Sat Apr 21 23:07:25 2018 +0200
gnu: stage0-boot: Update to new gitlab url scheme. * gnu/packages/mes.scm (stage0-boot): Update to new gitlab url scheme. --- gnu/packages/mes.scm | 132 +++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index bcae9fb..1cb4f52 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -82,77 +82,75 @@ "0rnkppwdkxbzkgp9s9ccmby9f7p3ijxjlmvj0pzqxwmrmpy7jwmb")))) (define-public stage0-boot - (let ((version "0.0.8") + (let ((version "0.0.8") (revision "0") (commit "14843efa5ed13372b1ec32a76d19f27b3febab91")) - (package - (name "stage0-boot") - (version (string-append version "-" revision "." (string-take commit 7))) - (synopsis "Manually created initial hex programs for full source bootstrapping") - (source (origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/stage0" - "/repository/archive.tar.gz?ref=" - commit)) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "0ws5g4r1rnyfaxrnyqzh4qr3w2a3i3wljcc095rk897wi1xz23jz")))) - (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-seed" - ,(origin - (method url-fetch) - (uri (string-append "https://gitlab.com/janneke/stage0-seed" - "/repository/archive.tar.gz?ref=" - "87039121e9ab4d48e9bade513c6f328cc9968583")) - (file-name (string-append "stage0-seed" "-" version ".tar.xz")) - (sha256 - (base32 - "0m18mv825nykj738gg9il60xb8xxc4015ypxgimhygdqxx0n66bp")))))) - (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")) - (stage0-seed (assoc-ref %build-inputs "stage0-seed")) - (out (assoc-ref %outputs "out")) - (out/bin (string-append out "/bin"))) - (setenv "PATH" (string-append bash "/bin:" - "../stage0-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 "stage0-seed") - (system* "tar" "--strip=1" "-C" "stage0-seed" "-xvf" stage0-seed) - (chdir "source") - (zero? (system (string-append -"set -ex;" -"mkdir -p " out/bin ";" -"hex Linux\\ Bootstrap/hex.hex > " out/bin "/hex;" -;; FIXME: exec-enable? -;;"hex Linux\\ Bootstrap/exec_enable.hex > " out/bin "/exec_enable;" -;;"exec_enable " out/bin "/hex" -;;"exec_enable " out/bin "/exec_enable" -"chmod +x " out/bin "/hex" -))))))) - (description - "Stage0 is the initial stage of a full source bootstrapping process. It + (package + (name "stage0-boot") + (version (string-append version "-" revision "." (string-take commit 7))) + (synopsis "Manually created initial hex programs for full source bootstrapping") + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/stage0" + "/-/archive/" commit + "/stage0-" commit ".tar.gz")) + (sha256 + (base32 + "0svmdz4ayv1lcqm49n4wn6wcfa7msvrjqg2h50hpx1kywg0rwqdr")))) + (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-seed" + ,(let ((commit "87039121e9ab4d48e9bade513c6f328cc9968583")) + (origin + (method url-fetch) + (uri (string-append "https://gitlab.com/janneke/stage0-seed" + "/-/archive/" commit + "/stage0-seed-" commit ".tar.gz")) + (sha256 + (base32 + "0089w85gw8vilsspyyhg6a8bwayic3piaqk2w2gvkwk7vcjbxdgd"))))))) + (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")) + (stage0-seed (assoc-ref %build-inputs "stage0-seed")) + (out (assoc-ref %outputs "out")) + (out/bin (string-append out "/bin"))) + (setenv "PATH" (string-append bash "/bin:" + "../stage0-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 "stage0-seed") + (system* "tar" "--strip=1" "-C" "stage0-seed" "-xvf" stage0-seed) + (chdir "source") + (zero? (system (string-append + "set -ex;" + "mkdir -p " out/bin ";" + "hex Linux\\ Bootstrap/hex.hex > " out/bin "/hex;" + ;; FIXME: exec-enable? + ;;"hex Linux\\ Bootstrap/exec_enable.hex > " out/bin "/exec_enable;" + ;;"exec_enable " out/bin "/hex" + ;;"exec_enable " out/bin "/exec_enable" + "chmod +x " out/bin "/hex"))))))) + (description + "Stage0 is the initial stage of a full source bootstrapping process. It contains hex0, the initial 400 byte self hosting hex assembler. It also comes with a Knight VM that runs Forth and Lisp.") - (home-page "https://savannah.nongnu.org/projects/stage0/") - (license gpl3+)))) + (home-page "https://savannah.nongnu.org/projects/stage0/") + (license gpl3+)))) (define-public mescc-tools-boot (let ((version "0.3")