From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UBe1My6I/V+iSQAA0tVLHw (envelope-from ) for ; Tue, 12 Jan 2021 11:29:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id kINYLy6I/V/VfwAAB5/wlQ (envelope-from ) for ; Tue, 12 Jan 2021 11:29:50 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B4C3E9403A2 for ; Tue, 12 Jan 2021 11:29:49 +0000 (UTC) Received: from localhost ([::1]:56838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzHrw-0003pf-An for larch@yhetil.org; Tue, 12 Jan 2021 06:29:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzHDm-00075a-Kg for guix-devel@gnu.org; Tue, 12 Jan 2021 05:48:18 -0500 Received: from tobias.gr ([2a02:c205:2020:6054::1]:46618) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzHDg-0004HM-Fy for guix-devel@gnu.org; Tue, 12 Jan 2021 05:48:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=iEbM5aV68gTJx7m7s3bCdW7JhVQ1quEzJ0v0eWPrngg=; h=date:in-reply-to: references:subject:cc:to:from; b=AdR8CgYY1p6lRVjD4QrAyzBYVuwoga35jrgeq FfBHvZ1fODIr6aSozqhAB8M6pDeLDvI8h1LpUxLJCqjKoH/DceZDio/J/TWlApBoe1vkJ/ uqKaY2mcTOK7XD5UQsPu0/L9SHjGHuUiyMyXodj7Ms84lw5xsRj5l57SdO+QzDwtu8b5l5 LZm+IT+JmIqx+MPrs+724xhZ5rfqDLpb41KS0njeW5m/U4krGWBnJF+nsS3iIviqhrbw3c AO8psRSGrt0+TMMestBcz+46Ls3JmNq1f6rhByxNBy9MQNF57x+5JJNBfH0Y5C/UlL4Rq5 7H2ga7iQ0pd/VqtMe3ie4r4Eg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id 8d86fdfb (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Tue, 12 Jan 2021 10:48:40 +0000 (UTC) BIMI-Selector: v=BIMI1; s=default; From: Tobias Geerinckx-Rice To: John Soo Subject: Re: Emacs-Guix repository location moved to Savannah References: <871rer5xxv.fsf@asu.edu> In-reply-to: <871rer5xxv.fsf@asu.edu> Date: Tue, 12 Jan 2021 11:48:06 +0100 Message-ID: <87pn2ao2hl.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.66 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=tobias.gr header.s=2018 header.b=AdR8CgYY; dmarc=pass (policy=reject) header.from=tobias.gr; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Migadu-Queue-Id: B4C3E9403A2 X-Spam-Score: -4.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: DYWslOgXw9xm --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hi, John Soo =E5=86=99=E9=81=93=EF=BC=9A > Emacs-Guix has a new home! I just pushed > a42f66cb40a9e60611f429a403b08dbed29bae02 to Emacs-Guix on=20 > Savannah. Thank you for taking care of this, and innumerable thanks to Alex=20 for creating and maintaining emacs-guix for so many years. > My first order of business will be fixing the broken=20 > subcommands. I > don't use many of them, though. If you have a command you want=20 > fixed, > please let me know and I will priortize it. I use it very infrequently and it currently won't start: Starting Guix REPL ... [2 times] geiser-repl--connection: No Geiser REPL for this buffer (try M-x=20 run-geiser) Starting Guix REPL ... [2 times] geiser-repl--wait-for-prompt: No prompt found! Probably my fault somewhere. Still, it would be nice if this=20 =E2=80=98just worked=E2=80=99 for those who don't have and want a custom Ge= iser=20 set-up. > What do you think about having conversations about Emacs-Guix on > guix-devel? I think that's a good idea & better than creating a separate list. Where do you accept patches? The one below is untested. Kind regards, T G-R --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-Remove-all-references-to-the-ancient-GuixSD-name.patch Content-Transfer-Encoding: quoted-printable From=20348ede3b9ba2e571e20af9e310d632de80331eae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 12 Jan 2021 11:45:01 +0100 Subject: [PATCH] Remove all references to the ancient GuixSD name. MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit * README (About, Installation): Replace =E2=80=98GuixSD=E2=80=99 with =E2= =80=98Guix System=E2=80=99. * doc/emacs-guix.texi (Package Commands, Profiles, Generations, System) (System From File, Services, Service Commands): Likewise. * elisp/guix-about.el (guix-logo-file): Unuse =E2=80=98guixsd-logo.svg=E2= =80=99. * elisp/guix-utils.el (guix-guixsd?): Remove now unused procedure. (guix-read-os-file-name): Update docstring. * images/README: Refer to singular =E2=80=98guix-logo.svg=E2=80=99. * images/guixsd-logo.svg: Delete file. =2D-- README | 4 +- doc/emacs-guix.texi | 14 +- elisp/guix-about.el | 9 +- elisp/guix-ui-service-location.el | 2 +- elisp/guix-ui-service.el | 2 +- elisp/guix-ui-system.el | 2 +- elisp/guix-utils.el | 6 +- elisp/guix.el | 2 +- images/README | 6 +- images/guixsd-logo.svg | 1022 ---------------------- scheme/emacs-guix/system-generations.scm | 2 +- 11 files changed, 21 insertions(+), 1050 deletions(-) delete mode 100644 images/guixsd-logo.svg diff --git a/README b/README index 1513e42..55a6956 100644 =2D-- a/README +++ b/README @@ -22,7 +22,7 @@ In short, Emacs-Guix provides the following features: =20 + profiles =20 =2D + profile generations (including system generations for GuixSD) + + profile generations (including system generations for Guix System) =20 + packages =20 @@ -94,7 +94,7 @@ the current commit of Emacs-Guix using [[file:guix.scm]] = file: guix package --install-from-file=3Dguix.scm #+END_SRC =20 =2D* IMPORTANT NOTE for non-GuixSD users +* IMPORTANT NOTE for non-Guix-System users =20 If you installed Guix using [[https://www.gnu.org/software/guix/manual/en/= html_node/Binary-Installation.html][Binary Installation]] method, most like= ly your environment (in particular, =3DGUILE_LOAD_PATH=3D) does not know where Gui= le diff --git a/doc/emacs-guix.texi b/doc/emacs-guix.texi index 06e4ee2..9547953 100644 =2D-- a/doc/emacs-guix.texi +++ b/doc/emacs-guix.texi @@ -339,7 +339,7 @@ Display installed packages. As explained above, @kbd{M= -x guix-installed-packages} uses an arbitrary profile that you can specify, while the other commands display packages installed in 2 special profiles: @file{~/.guix-profile} and @file{/run/current-system/profile} =2D(only on GuixSD). +(only on Guix System). =20 @findex guix-obsolete-packages @item M-x guix-obsolete-packages @@ -632,7 +632,7 @@ the default user profile profile, populated by @code{guix pull} =20 @item /var/guix/profiles/system =2Dsystem profile (only on GuixSD) +system profile (only on Guix System) =20 @item @env{GUIX_PROFILE} (only if this environment variable is set and this profile is not the @@ -739,7 +739,7 @@ date/time prompt,,, org, The Org Manual}). =20 @end table =20 =2DIf you use GuixSD, you may also look at the system generations using +If you use Guix System, you may also look at the system generations using the similar commands (@pxref{System Commands}). =20 @node Generation Keys @@ -783,7 +783,7 @@ with another marked generation. @node System @chapter System =20 =2DThis chapter describes Emacs-Guix features related to GuixSD, in +This chapter describes Emacs-Guix features related to Guix System, in particular: =20 @itemize @@ -802,7 +802,7 @@ particular: @section System From File =20 @cindex system =2DYour system configuration file (for GuixSD) contains +Your system configuration file (for Guix System) contains @code{operating-system} declaration (@pxref{operating-system Reference,,, guix, The GNU Guix Reference Manual}). =20 @@ -823,7 +823,7 @@ provides. @section Services =20 @cindex services =2DIf you use GuixSD, you may have a wish to become more familiar with +If you use Guix System, you may have a wish to become more familiar with the system services (@pxref{Services,,, guix, The GNU Guix Reference Manual}). Emacs-Guix provides several commands to display these services. @@ -838,7 +838,7 @@ services. =20 The interface for services is very similar to the interface for packages (@pxref{Packages}). The following commands allows you to =2Dlook at the GuixSD services. +look at the Guix System services. =20 @table @kbd =20 diff --git a/elisp/guix-about.el b/elisp/guix-about.el index 957e826..e0de219 100644 =2D-- a/elisp/guix-about.el +++ b/elisp/guix-about.el @@ -80,13 +80,10 @@ This is not really a text, it is a list of arguments pa= ssed to `fancy-splash-insert'.") =20 (defun guix-logo-file () =2D "Return the file name of Guix(SD) logo image. =2DReturn nil, if the image cannot be found." + "Return the file name of the Guix logo image. +Return nil if the image cannot be found." (when guix-image-directory =2D (expand-file-name (if (guix-guixsd?) =2D "guixsd-logo.svg" =2D "guix-logo.svg") =2D guix-image-directory))) + (expand-file-name "guix-logo.svg" guix-image-directory))) =20 ;; Guix builds Emacs-Guix with 'emacs-minimal' package which does not ;; support many things including image stuff. This leads to a diff --git a/elisp/guix-ui-service-location.el b/elisp/guix-ui-service-loca= tion.el index 03e9382..14b0f58 100644 =2D-- a/elisp/guix-ui-service-location.el +++ b/elisp/guix-ui-service-location.el @@ -20,7 +20,7 @@ ;;; Commentary: =20 ;; This file provides a 'list' interface for displaying locations of =2D;; GuixSD services. +;; Guix System services. =20 ;;; Code: =20 diff --git a/elisp/guix-ui-service.el b/elisp/guix-ui-service.el index db03355..c407b45 100644 =2D-- a/elisp/guix-ui-service.el +++ b/elisp/guix-ui-service.el @@ -19,7 +19,7 @@ =20 ;;; Commentary: =20 =2D;; This file provides 'list'/'info' interface for GuixSD services. +;; This file provides 'list'/'info' interface for Guix System services. =20 ;;; Code: =20 diff --git a/elisp/guix-ui-system.el b/elisp/guix-ui-system.el index 2f0e062..4cfc1e3 100644 =2D-- a/elisp/guix-ui-system.el +++ b/elisp/guix-ui-system.el @@ -19,7 +19,7 @@ =20 ;;; Commentary: =20 =2D;; This file provides 'info' interface for GuixSD system configuration +;; This file provides 'info' interface for Guix System configuration ;; files =E2=80=93 i.e., for 'operating-system' declaration. =20 ;;; Code: diff --git a/elisp/guix-utils.el b/elisp/guix-utils.el index f90f1c8..02570aa 100644 =2D-- a/elisp/guix-utils.el +++ b/elisp/guix-utils.el @@ -28,10 +28,6 @@ (require 'bui-utils) (require 'guix nil t) =20 =2D(defun guix-guixsd? () =2D "Return non-nil, if current system is GuixSD." =2D (file-exists-p "/run/current-system")) =2D (defun guix-assert-build-farm () "Raise an error if `build-farm' package does not exist." (unless (require 'build-farm nil t) @@ -336,7 +332,7 @@ See `guix-support-dired' for details. See also `guix-r= ead-file-name'." mustmatch initial predicate))) =20 (defun guix-read-os-file-name () =2D "Read file name with GuixSD 'operating-system' declaration." + "Read file name with Guix System 'operating-system' declaration." (guix-read-file-name-maybe "System configuration file: ")) =20 (defun guix-find-file (file) diff --git a/elisp/guix.el b/elisp/guix.el index aea9b10..b4c170a 100644 =2D-- a/elisp/guix.el +++ b/elisp/guix.el @@ -34,7 +34,7 @@ ;; ;; - to look at, compare and remove profile generations; ;; =2D;; - to look at system services and generations (if you use GuixSD); +;; - to look at system services and generations (if you use Guix System); ;; ;; - to do many other things. ;; diff --git a/images/README b/images/README index 5e695f8..c810c3e 100644 =2D-- a/images/README +++ b/images/README @@ -1,7 +1,7 @@ -*- org -*- =20 =2DGuix(SD) logotips ("guix-logo.svg" and "guixsd-logo.svg" files) were =2Dtaken from the [[http://git.savannah.gnu.org/cgit/guix/guix-artwork.git]= [Guix Artwork repository]] (original names: "Guix.svg" and =2D"GuixSD.svg" in "logo" directory). They are available under the terms +The Guix logotype ("guix-logo.svg" file) was +taken from the [[http://git.savannah.gnu.org/cgit/guix/guix-artwork.git][G= uix Artwork repository]] (original name: "Guix.svg" +in "logo" directory). Is is available under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License. diff --git a/images/guixsd-logo.svg b/images/guixsd-logo.svg deleted file mode 100644 index 8a01edd..0000000 =2D-- a/images/guixsd-logo.svg +++ /dev/null @@ -1,1022 +0,0 @@ =2D =2D =2D =2D =2D Guix System Distribution (Logo) =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D image/svg+xml =2D =2D Guix System Distribution (Logo) =2D 2015-02-07 =2D =2D =2D Luis Felipe L=C3=B3pez Acevedo =2D =2D =2D =2D =2D Luis Felipe L=C3=B3pez Acevedo =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D Font: Sans =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D =2D diff --git a/scheme/emacs-guix/system-generations.scm b/scheme/emacs-guix/s= ystem-generations.scm index 80a743f..4009773 100644 =2D-- a/scheme/emacs-guix/system-generations.scm +++ b/scheme/emacs-guix/system-generations.scm @@ -20,7 +20,7 @@ ;;; Commentary: =20 ;; This module provides the code to get info about system generations of =2D;; GuixSD profiles. +;; Guix System profiles. =20 ;;; Code: =20 =2D-=20 2.30.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCX/1+Zw0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW153h4BAJ8YOXzREDyLEe63i47LC6v0ynfAcR+N+vm7uxCm yF5pAQDfXlWobRyChxPgD7P5dHfUD07jFLhRKZj2zjFZKP/pBQ== =vtuX -----END PGP SIGNATURE----- --==-=-=--