aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2016-11-12 18:33:45 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2016-11-13 13:34:00 +0100
commit917239ff99468de351f93a019e9abe52f29adec7 (patch)
tree7b364ae2b95c23ec63ab57ac2d0d0aaecde858d6 /gnu
parent3b0ac7950057a99cde7a973387e1fe8a13db5518 (diff)
downloadguix-917239ff99468de351f93a019e9abe52f29adec7.tar.gz
guix-917239ff99468de351f93a019e9abe52f29adec7.zip
gnu: tidy: Use ‘modify-phases’.
* gnu/packages/web.scm (tidy)[arguments]: Use the ‘modify-phases’ syntax.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/web.scm17
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 5237cc7b9e..6cffc79db1 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -510,15 +510,14 @@ UTS#46.")
(patches (search-patches "tidy-CVE-2015-5522+5523.patch"))))
(build-system gnu-build-system)
(arguments
- '(#:phases (alist-cons-after
- 'unpack 'bootstrap
- (lambda* (#:key inputs #:allow-other-keys)
- ;; configure.in and Makefile.am aren't in the root of the
- ;; source tree.
- (copy-recursively "build/gnuauto" ".")
- (setenv "AUTOMAKE" "automake --foreign")
- (zero? (system* "autoreconf" "-vfi")))
- %standard-phases)))
+ '(#:phases (modify-phases %standard-phases
+ (add-after 'unpack 'bootstrap
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; configure.in and Makefile.am aren't in the root of the
+ ;; source tree.
+ (copy-recursively "build/gnuauto" ".")
+ (setenv "AUTOMAKE" "automake --foreign")
+ (zero? (system* "autoreconf" "-vfi")))))))
(native-inputs
`(("automake" ,automake)
("autoconf" ,autoconf)
tooltip'>* gnu/services/dbus.scm (polkit-service-type)[description]: New field. * gnu/services/dict.scm (dicod-service-type)[description]: New field. * gnu/services/dns.scm (knot-service-type)[description]: New field. * gnu/services/networking.scm (dhcpd-service-type)[description]: New field. * gnu/services/shepherd.scm (shepherd-root-service-type)[description]: New field. * gnu/services/xorg.scm (slim-service-type)[description]: New field. (screen-locker-service-type)[description]: New field. * gnu/system/pam.scm (pam-root-service-type)[description]: New field. * gnu/system/shadow.scm (account-service-type)[description]: New field. Ludovic Courtès 2020-04-17services: account: Have 'user-processes' depend on 'user-homes'....Until now, 'user-homes' happened to start right after 'user-processes' and before services that depend on a home directory but the dependency was not explicit. This addresses it. * gnu/system/shadow.scm (account-service-type): Extend USER-PROCESSES-SERVICE-TYPE. Ludovic Courtès 2020-04-01system: Move nanorc to XDG_CONFIG_HOME....* gnu/system/shadow.scm (skeleton-directory): Move .nanorc to .config/nano/nanorc. Efraim Flashner 2020-03-30Revert "system: Move nanorc to XDG_CONFIG_HOME."...This reverts commit bd71818df31364bbd04f3f13b3bbb251636748b4. This changed caused system reconfiguration to fail like this: ------ building /gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv... Backtrace: 4 (primitive-load "/gnu/store/2x7d0jsbgf2ndb5fsk0nj07rhsx?") In ice-9/eval.scm: 619:8 3 (_ #f) In ice-9/boot-9.scm: 260:13 2 (for-each #<procedure 7ffff6ad8100 at ice-9/eval.scm:3?> ?) In guix/build/utils.scm: 343:27 1 (_ "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc" ?) In unknown file: 0 (copy-file "/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrs?" ?) ERROR: In procedure copy-file: In procedure copy-file: No such file or directory `/gnu/store/v1grsca743phw41lyf63dzmh9nz5jlpn-bash_profile' -> `.bash_profile' `/gnu/store/xdsaw0mj6axj427hyi6ysrnsxi21n7d5-bashrc' -> `.bashrc' `/gnu/store/6i0b236dyar78zc5k5hrj5dv3vr4zb9w-zprofile' -> `.zprofile' `/gnu/store/ajrgkj1s9vdcq00drn703f4zj9dvfrsv-nanorc' -> `.config/nano/nanorc' builder for `/gnu/store/y1x8asbzw624ywgkpin35p1i4bqnyfy2-skel.drv' failed with exit code 1 ------ Leo Famulari 2020-03-30system: Move nanorc to XDG_CONFIG_HOME....* gnu/system/shadow.scm (default-skeletons): Move .nanorc to .config/nano/nanorc. Efraim Flashner 2020-03-19gnu: system: Remove guile-wm from skeleton....* gnu/system/shadow.scm (default-skeletons): Remove guile-wm (especially as a dependency). Jan Nieuwenhuizen 2019-04-23services: account: Make 'user-homes' a one-shot service....* gnu/system/shadow.scm (account-shepherd-service): Add 'one-shot?' field. Return #t from 'start'. Ludovic Courtès 2019-03-07activation: Build account databases with (gnu build accounts)....* gnu/build/activation.scm (enumerate, current-users, current-groups) (add-group, add-user, modify-user, ensure-user): Remove. (activate-users+groups)[touch, activate-user]: Remove. [make-home-directory]: New procedure. Rewrite in terms of 'user+group-databases', 'write-group', etc. * gnu/build/install.scm (directives): Remove "/root". * gnu/system/shadow.scm (account-activation): Remove (setenv "PATH" ...) expression, which is now unneeded. Ludovic Courtès 2019-03-07activation: Operate on <user-account> and <user-group> records....* gnu/system/accounts.scm (sexp->user-group, sexp->user-account): New procedures. * gnu/system/shadow.scm (account-activation): Call them in the arguments to 'activate-users+groups'. (account-shepherd-service): Likewise. * gnu/build/activation.scm (activate-users+groups): Expect a list of <user-account> and a list of <user-group>. Replace uses of 'match' on tuples with calls to record accessors. (activate-user-home): Likewise. Ludovic Courtès 2019-03-07system: Add (gnu system accounts)....The (gnu system accounts) module is meant to be used both on the build- and on the host-side. * gnu/system/shadow.scm <top level>: Call 'default-shell'. (<user-account>, <user-group>): Move to... * gnu/system/accounts.scm: ... here. New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add system/accounts.scm. Ludovic Courtès 2018-10-19system: Rename .zlogin to .zprofile....Reported by Meiyo Peng <meiyo.peng@gmail.com>. * gnu/system/shadow.scm (default-skeletons): Rename zlogin to zprofile. Chris Marusich 2018-07-23system: '.guile' skeleton now recommends 'guile-colorized'....* gnu/system/shadow.scm (default-skeletons)[".guile"]: Recommend 'guile-colorized'. Ludovic Courtès 2018-07-05Don't force colour in aliases....* gnu/system/shadow.scm (default-skeletons): Substitute ‘--color=auto’ for ‘--color’ (which implies ‘=always’) in aliases. * doc/guix.texi (G-Expressions): Also adjust examples as that makes more sense. Tobias Geerinckx-Rice 2018-06-11system: Default .bashrc now sources /etc/bashrc....This is a followup to commit 1382bde93c3ccb5be6b846b932edd7707fac1a3e, which disabled automatic sourcing of /etc/bashrc by interactive shell. The noticeable effect of the change would be that Bash completion would only work in login shells. * gnu/system/shadow.scm (default-skeletons)["bashrc"]: Source /etc/bashrc. Ludovic Courtès 2018-04-04system: Add default '.nanorc' with syntax highlighting....* gnu/system/shadow.scm (default-skeletons): Add ".nanorc". Ludovic Courtès 2018-01-11Merge branch 'master' into core-updatesLeo Famulari 2018-01-09system: Extend .gdbinit to authorize extensions from /gnu/store/*/lib....* gnu/system/shadow.scm (default-skeletons)["gdbinit"]: Add 'auto-load safe-path' statement. Ludovic Courtès 2017-12-08gnu: guile: Move Readline support to a separate 'guile-readline' package....This reduces the closure of Guile from 131 MiB to 116 MiB and removes extra readline/ncurses builds from the bootstrap path. * gnu/packages/guile.scm (guile-2.0)[inputs]: Remove READLINE. (make-guile-readline): New procedure. (guile-readline): New variable. * gnu/system/shadow.scm (default-skeletons): Adjust '.guile' so that it gracefully deals with missing (ice-9 readline). Ludovic Courtès