From 796dc2dc3903dbba1320f9405168597b8561939e Mon Sep 17 00:00:00 2001 From: "Jan (janneke) Nieuwenhuizen" Date: Sat, 30 Apr 2022 09:44:57 +0200 Subject: [PATCH] doc: Use `guix shell' instead of `guix environment'. * HACKING (SETUP): Use `guix shell' instead of `guix environment'. * INSTALL (Guix): Likewise. * PORTING (Setup environment): Likewise. * doc/mes.texi (Building from Git): Likewise. * simple.sh: Likewise. * guix.scm: Likewise. Add time-machine with working commit. --- HACKING | 4 ++-- INSTALL | 8 ++++---- PORTING | 4 ++-- doc/mes.texi | 4 ++-- guix.scm | 4 ++-- simple.sh | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/HACKING b/HACKING index b90c5b45..fe1450f5 100644 --- a/HACKING +++ b/HACKING @@ -2,7 +2,7 @@ #+TITLE: Hacking GNU Mes * SETUP - guix environment -l guix.scm #64 bit + 32bit + guix shell #64 bit + 32bit CC=i686-unknown-linux-gnu-gcc ./configure CC=arm-unknown-linux-gnu-gcc ./configure @@ -201,7 +201,7 @@ https://notabug.org/rain1/hex86/src/master/tests/hex0b3.hex86 ** linux syscalls: https://fedora.juszkiewicz.com.pl/syscalls.html * legalese -Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen +Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/INSTALL b/INSTALL index bc418713..5d753770 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ -*- org -*- #+TITLE: Building and Installing GNU Mes -Copyright © 2016,2017,2018,2019,2021 Jan (janneke) Nieuwenhuizen +Copyright © 2016,2017,2018,2019,2021,2022 Jan (janneke) Nieuwenhuizen Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -20,9 +20,9 @@ similar way. ** Prerequisites *** Guix #+BEGIN_SRC bash - guix environment -l guix.scm #64 bit + 32bit - guix environment --system=i686-linux -l guix.scm #32 bit only - guix environment --system=armhf-linux -l guix.scm #32 bit only + guix shell #64 bit + 32bit + guix shell --system=i686-linux #32 bit only + guix shell --system=armhf-linux #32 bit only #+END_SRC *** Other GNU/Linux diff --git a/PORTING b/PORTING index 24990e11..6d696d8f 100644 --- a/PORTING +++ b/PORTING @@ -22,7 +22,7 @@ to your config.scm and run guix system reconfigure. For example (note: ARM is no longer a 'port', see HACKING) #+BEGIN_SRC bash - guix environment --system=armhf-linux --pure --ad-hoc bash coreutils diffutils findutils gawk gcc-toolchain@7 grep git guile@2.2 gzip help2man make mescc-tools nyacc openssh-sans-x pkg-config sed tar texinfo + guix shell --system=armhf-linux --pure bash coreutils diffutils findutils gawk gcc-toolchain@7 grep git guile@2.2 gzip help2man make mescc-tools nyacc openssh-sans-x pkg-config sed tar texinfo #+END_SRC ** Try it @@ -75,7 +75,7 @@ a Reduced Binary seed, thus significantly reducing the Trusted Computing Base (TCB), strategic decisions about the build process can start. * Legalese -Copyright © 2019 Jan (janneke) Nieuwenhuizen <[[mailto:janneke@gnu.org][janneke@gnu.org]]> +Copyright © 2019,2022 Jan (janneke) Nieuwenhuizen <[[mailto:janneke@gnu.org][janneke@gnu.org]]> Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/doc/mes.texi b/doc/mes.texi index 1e16e5ad..0f273b90 100644 --- a/doc/mes.texi +++ b/doc/mes.texi @@ -13,7 +13,7 @@ @set OPENPGP-SIGNING-KEY-ID 1A858392E331EAFDB8C27FFBF3C1A0D9C1D65273 @copying -Copyright @copyright{} 2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen@* +Copyright @copyright{} 2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen@* Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or @@ -1034,7 +1034,7 @@ all the dependencies and appropriate environment variables are set up to hack on Mes: @example -guix environment -l .guix.scm +guix shell @end example Finally, you have to invoke @code{make check} to run tests diff --git a/guix.scm b/guix.scm index 27f7ecc9..61549826 100644 --- a/guix.scm +++ b/guix.scm @@ -1,7 +1,7 @@ ;;; guix.scm -- Guix package definition ;;; GNU Mes --- Maxwell Equations of Software -;;; Copyright © 2018,2019 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2018,2019,2022 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Mes. ;;; @@ -30,7 +30,7 @@ ;; ;; To use as the basis for a development environment, run: ;; -;; guix environment -l guix.scm +;; guix time-machine --commit=ffb616b69dced25b840f2e5178062072d89623eb -- shell ;; ;;; Code: diff --git a/simple.sh b/simple.sh index 95ee4d11..8774090d 100755 --- a/simple.sh +++ b/simple.sh @@ -1,7 +1,7 @@ #! /bin/sh # GNU Mes --- Maxwell Equations of Software -# Copyright © 2019,2020 Jan (janneke) Nieuwenhuizen +# Copyright © 2019,2020,2022 Jan (janneke) Nieuwenhuizen # # This file is part of GNU Mes. # @@ -143,9 +143,9 @@ set -e # Mes C lib build # To get a i686-unknown-linux-gnu-gcc, you may do: -# guix environment -l guix.scm +# guix shell # or -# guix environment --ad-hoc -e '(begin (use-modules (gnu packages cross-base)) (list (cross-binutils "i686-unknown-linux-gnu") (cross-gcc "i686-unknown-linux-gnu")))' +# guix shell -e '(begin (use-modules (gnu packages cross-base)) (list (cross-binutils "i686-unknown-linux-gnu") (cross-gcc "i686-unknown-linux-gnu")))' ## Clean ## rm -rf out-mes