Re: [PATCH 2/2] gnu: Add xclip.
LGTM. Ludo'.
Re: Howto run guix.el correctly?
Alex Kost alez...@gmail.com skribis: Ludovic Courtès (2014-12-01 15:49 +0300) wrote: Alex Kost alez...@gmail.com skribis: [...] Thanks, I have created wip-emacs-packages branch: the elisp code is ready, so now I'm going to walk through existing emacs packages in order to add “…-autoloads.el” to each one. I just browsed it, and it looks good so far. OK, I think I finished it. I tried to describe the new feature in the manual. Should it be improved somehow? It looks good to me, nothing to add. Also I think it would be better to squash all those “gnu: emacs: Add ...-autoloads.el.” into a single commit. WDYT? Either way is fine with me; do as seems best to you. And after that I believe all that may go to master. Agreed. I was just thinking: if we want to take over the Emacs world, we need an ELPA importer for ‘guix import’. (In case you were wondering what to do next. ;-)) Sorry, I'm not interested in it :-( No problem, maybe someone else, who knows? :-) Thank you! Ludo’.
Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.
On Tue, Dec 02, 2014 at 07:01:52AM +0100, John Darrington wrote: +++ b/gnu/packages/xdisorg.scm +(define-module (gnu packages xorg) There is a copy-paste error here. -;; packages outside the x.org system proper - -(define-public xclip - (package This apparently refers to your modified xorg.scm, since the one on master does not include xclip. Now, xorg needs to include xdisorg, I think; and vice versa. Hopefully, this does not introduce circular dependencies. Did you try to build a few packages? Andreas
Re: [PATCH 00/13] Add gourmet (and dependent python packages)
On Mon, Dec 01, 2014 at 09:09:01PM -0600, Eric Bavier wrote: I'm not knowledgeable about cherry-picking. Could I just push these packages now? It looks like hydra is caught up with the x86-64 and i686 builds at least. I suppose you could. Anyway, there seems to be a problem with hydra right now, it has not picked up any of the commits yesterday, and I cannot ssh into it. Andreas
Re: [PATCH 00/13] Add gourmet (and dependent python packages)
Andreas Enge andr...@enge.fr skribis: On Mon, Dec 01, 2014 at 09:09:01PM -0600, Eric Bavier wrote: I'm not knowledgeable about cherry-picking. Could I just push these packages now? It looks like hydra is caught up with the x86-64 and i686 builds at least. I suppose you could. Anyway, there seems to be a problem with hydra right now, it has not picked up any of the commits yesterday, and I cannot ssh into it. Yes, there are “evaluation errors”. I’m looking into it. Ludo’.
Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.
On Tue, Dec 02, 2014 at 01:49:26PM +0100, Ludovic Courtès wrote: Andreas Enge andr...@enge.fr skribis: Now, xorg needs to include xdisorg, I think; and vice versa. Why? I thought xdisorg would only contain third-party packages that Xorg does not depend on, no? Maybe I was mistaken. I was thinking of mesa, but it is defined in gl and not xorg. At the same time it has inputs from xorg (currently, libdrm, but also libx11 and others); and it is an input to xorg, for xf86-video- So there is already a circle between the gl and xorg modules now, which is not a circular dependency; and I assume things should still work after part of xorg is moved to xdisorg. Andreas
Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.
Andreas Enge andr...@enge.fr skribis: Maybe I was mistaken. I was thinking of mesa, but it is defined in gl and not xorg. At the same time it has inputs from xorg (currently, libdrm, but also libx11 and others); and it is an input to xorg, for xf86-video- OK. So there is already a circle between the gl and xorg modules now, which is not a circular dependency; and I assume things should still work after part of xorg is moved to xdisorg. Yeah, I think this won’t make any difference. Ludo’.
Re: use zsh as login shell
Ludovic Courtès l...@gnu.org writes: 宋文武 iyzs...@gmail.com skribis: Ludovic Courtès l...@gnu.org writes: 宋文武 iyzs...@gmail.com skribis: Ludovic Courtès l...@gnu.org writes: [...] So, instead of what you suggest, what about having: 1. /etc/profile and /etc/zlogin (?) both source /etc/environment, which uses plain Bourne syntax. 2. PATH is defined in /etc/environment and includes ~/.guix-profile/bin. /etc/environment is defined by pam_env to be a simple KEY=VAL file, with no support for varibales substitute. If we do not use pam_env (linux specified?), I think we should let /etc/zlogin source /etc/profile instead. Yes, but they would contain almost the same lines, right? To what extent is zsh Bourne- or Bash-compatible? Does ‘export foo=bar’ work for zsh? It does. If it does, let’s just keep /etc/profile, and use it for both zsh and Bash. And we don't want /etc/zlogin when not using zsh at all, IIUC while skeletons is configurable at the top os-expr, /etc/zlogin is not. It’s OK to have a 2-KiB /etc/zlogin, even when one doesn’t use zsh. 3. The skeleton for ~/.bash_profile sources /etc/profile, /etc/bashrc, and ~/.bashrc. 4. The definition of PS1 is moved from /etc/profile to /etc/bashrc. 5. The skeleton for ~/.bashrc sources /etc/bashrc. It seem too much, what I suggested is: for login, su (pam_env): /etc/environment for login shell: ~/.bash_profile, ~/.zlogin for interactive: ~/.bashrc, ~/.zshrc skeletons only installed when needed :) As a first step, what about always installing the skeletons? Then we can see whether/how to refine that. No problem. Thanks, Ludo’. And this is what I have so far: From 1e400957b29a47f63548df39b36a7c0f1d8a37d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= iyzs...@gmail.com Date: Tue, 2 Dec 2014 21:40:52 +0800 Subject: [PATCH] gnu: Add /etc/environment. * gnu/system.scm (default-/etc/environment): New procedure. (etc-directory)[profile]: Remove it. (etc-directory)[environment]: Add it. * gnu/system/linux.scm (unix-pam-service): Add #:readenv? parameter. * gnu/services/base.scm (mingetty-service): Pass #t as #:readenv? to unix-pam-service. * gnu/system/shadow.scm (default-skeletons): Add .bash_profile. Adjust .bashrc. --- gnu/services/base.scm | 3 ++- gnu/system.scm| 40 gnu/system/linux.scm | 26 -- gnu/system/shadow.scm | 18 +++--- 4 files changed, 53 insertions(+), 34 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 71b..b8dedd7 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -372,7 +372,8 @@ the ``message of the day''. ;; duplicates are removed. (list (unix-pam-service login #:allow-empty-passwords? allow-empty-passwords? - #:motd motd))) + #:motd motd + #:readenv? #t))) (define* (nscd-service #:key (glibc (canonical-package glibc))) Return a service that runs libc's name service cache daemon (nscd). diff --git a/gnu/system.scm b/gnu/system.scm index 731f9de..b0cf59f 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -351,6 +351,21 @@ This is the GNU system. Welcome.\n) Return the default /etc/hosts file. (text-file hosts (local-host-aliases host-name))) +(define* (default-/etc/environment #:key locale timezone) + Return the default /etc/environment file. + (let* ((profile /run/current-system/profile) + (path (string-join (list /run/setuid-programs + (string-append profile /bin) + (string-append profile /sbin)) +:))) +(text-file* environment \ +LANG= locale +TZ= timezone +TZDIR= tzdata /share/zoneinfo +LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules +PATH= path +INFOPATH=/run/current-system/profile/share/info\n))) + (define* (etc-directory #:key (locale C) (timezone Europe/Paris) (issue Hello!\n) @@ -375,25 +390,10 @@ This is the GNU system. Welcome.\n) (nsswitch (text-file nsswitch.conf hosts: files dns\n)) - ;; TODO: Generate bashrc from packages' search-paths. - (bashrc(text-file* bashrc -export PS1='\\u@\\h \\w\\$ ' - -export LC_ALL=\ locale \ -export TZ=\ timezone \ -export TZDIR=\ tzdata /share/zoneinfo\ - -# Tell 'modprobe' co. where to look for modules. -export LINUX_MODULE_DIRECTORY=/run/booted-system/kernel/lib/modules - -export PATH=$HOME/.guix-profile/bin:/run/current-system/profile/bin -export PATH=/run/setuid-programs:/run/current-system/profile/sbin:$PATH -export CPATH=$HOME/.guix-profile/include: profile /include -export LIBRARY_PATH=$HOME/.guix-profile/lib: profile /lib -export
Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.
Eric Bavier ericbav...@gmail.com skribis: This patch moved pixman to xdisorg.scm, but pixman is a propagated input to xorg-server in xorg.scm. Indeed, there’s a number of “unbound variable” warnings: --8---cut here---start-8--- gnu/packages/gtk.scm:83:4: warning: possibly unbound variable `pixman' gnu/packages/xorg.scm:2258:12: warning: possibly unbound variable `mtdev' gnu/packages/xorg.scm:2610:12: warning: possibly unbound variable `libdrm' gnu/packages/xorg.scm:4336:6: warning: possibly unbound variable `pixman' --8---cut here---end---8--- John: could you adjust the #:use-module clauses of the affected modules? Thanks, Ludo’.
Re: [PATCH 1/2] gnu: Move non-x.org stuff out of xorg.scm.
On Tue, Dec 02, 2014 at 05:18:06PM +0100, Ludovic Court??s wrote: Seeing you were not on IRC, I went ahead and fixed it in commit 6c0e878. OK. Thanks. Sorry for not noticing this beforehand. -- PGP Public key ID: 1024D/2DE827B3 fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. signature.asc Description: Digital signature
Re: Howto run guix.el correctly?
Ludovic Courtès (2014-12-02 11:39 +0300) wrote: Alex Kost alez...@gmail.com skribis: Ludovic Courtès (2014-12-01 15:49 +0300) wrote: Alex Kost alez...@gmail.com skribis: [...] Thanks, I have created wip-emacs-packages branch: the elisp code is ready, so now I'm going to walk through existing emacs packages in order to add “…-autoloads.el” to each one. I just browsed it, and it looks good so far. OK, I think I finished it. I tried to describe the new feature in the manual. Should it be improved somehow? It looks good to me, nothing to add. Also I think it would be better to squash all those “gnu: emacs: Add ...-autoloads.el.” into a single commit. WDYT? Either way is fine with me; do as seems best to you. OK, I squashed them up; it looks cleaner for me this way. And after that I believe all that may go to master. Agreed. Thanks, done. -- Alex
Re: Gluglug X60 Guix howto
白熊 guix-devel_gnu@sumou.com writes: On 2014年11月23日 20:22:24 GMT+03:00, Alex Sassmannshausen alex.sassmannshau...@gmail.com wrote: Hello, I received a request for instructions on how to get Guix running as standalone on the Gluglug X60 — my work is ongoing (I haven't reconfigured the Grub BIOS, nor have I got wireless working yet), but a first draft may help other owners. I hope you can get the wireless working! Especially during Guix install... I run standalone Guix on my Gluglug X60 with wireless. All you have to do is create a wpa_supplicant.conf file containing stanzas like this: --8---cut here---start-8--- network={ ssid=my network name key_mgmt=WPA-PSK psk=my network password } --8---cut here---end---8--- and then run: wpa_supplicant -i wlp2s0 -c /path/to/wpa_supplicant.conf -B dhclient wlp2s0 If you have problems connecting to wireless, you can replace the -B with -d in the wpa_supplicant command, which will run it in the foreground with debugging output enabled. Regards, Mark
Re: [PATCH] gnu: Add Glulxe.
Eric Bavier ericbav...@gmail.com writes: This is a bit terse, IMHO. Perhaps something like: (let* ((out (assoc-ref outputs out)) (inc (string-append out /include))) (begin (mkdir-p inc) (for-each (lambda (f) (copy-file f (string-append inc / f))) '(glk.h glkstart.h gi_blorb.h gi_dispa.h Make.glkterm)) (mkdir-p lib) (copy-file libglkterm.a (string-append out /lib/libglkterm.a It's not important, but FYI the 'begin' above is not needed. The 'let*' includes an implicit 'begin'. Mark