~ruther/guix-local

ref: e5ffe52cc7d0fa3242e3cd11f63c94deab91a3d5 guix-local/gnu/services/xorg.scm -rw-r--r-- 10.4 KiB
482dbe6a — 宋文武 11 years ago
services: slim: Pass SESSION to ~/.xsession as "$1".

* gnu/services/xorg.scm (xinitrc)[builder]: Pass SESSION to ~/.xsession.
e0b85670 — 宋文武 11 years ago
services: slim: Allow non-absolute path to be used as session command.

* gnu/services/xorg.scm (xinitrc)[builder]: Don't check the existence
  of COMMAND.  Only run ~/.xsession when it exists.
4bd43bbe — 宋文武 11 years ago
services: slim: Use /run/current-system/profile/share/xsessions as sessiondir.

* gnu/services/xorg.scm (<session-type>, %windowmaker-session-type)
  (%ratposion-session-type, %sawfish-session-type, %default-xsessions)
  (xsessions-directory): Remove.
  (slim-service): Remove #:sessions parameter.
  [slim.cfg]: Use /run/current-system/profile/share/xsessions as sessiondir.
* doc/guix.texi <X Window>: Adjust accordingly.
16c33bfb — Ludovic Courtès 11 years ago
services: xorg: Fix file descriptor leak from SLiM/xinitrc.

This reverts commit 9515b745547cff08ad5b958bc54323dab19f29b9.

* gnu/services/xorg.scm (xinitrc)[builder](close-all-fdes): Start from
  file descriptor 3.
9515b745 — Mark H Weaver 11 years ago
Revert "services: xorg: Fix file descriptor leak from SLiM/xinitrc."

This reverts commit ec4a4c46efaf2e7373f331654640f1321c0f2e62,
because it broke XFCE.
3820d397 — Mark H Weaver 11 years ago
Merge branch 'master' into core-updates

Conflicts:
	gnu/packages/gnupg.scm
ec4a4c46 — Ludovic Courtès 11 years ago
services: xorg: Fix file descriptor leak from SLiM/xinitrc.

Previously processes started from the window manager would have a couple
of leaked file descriptors: writable /var/log/slim.log and readable
/gnu/store/…-xinitrc.

* gnu/services/xorg.scm (xinitrc)[builder]: Add 'close-all-fdes'.  Use
  it in 'exec-from-login-shell'.
93be4e8e — Ludovic Courtès 11 years ago
Merge branch 'master' into core-updates
e1509174 — Ludovic Courtès 11 years ago
services: slim: Add "F1 to change" in session message.

* gnu/services/xorg.scm (slim-service)[slim.cfg]: Add 'session_msg'.
a21b23d3 — Ludovic Courtès 11 years ago
services: slim: Preserve the order of session types.

That makes WindowMaker the default session, by default.

* gnu/services/xorg.scm (xsessions-directory)[builder]: Prepend a number
  in the file name to preserve the order of SESSIONS.
  (slim-service): Augment docstring.
* doc/guix.texi (X Window): Adjust accordingly.
ca63770a — Ludovic Courtès 11 years ago
services: xorg: Add Nouveau driver.

* gnu/services/xorg.scm (xorg-start-command)[xserver.conf]: Add
  XF86-VIDEO-NOUVEAU.
5ce93d9a — 宋文武 11 years ago
services: xorg: Add sawfish session.

* gnu/services/xorg.scm (%sawfish-session-type): New variable.
* doc/guix.texi (X Window): Mention it.
ffc3a02b — Ludovic Courtès 11 years ago
services: xorg: Define the <session-type> record type.

* gnu/services/xorg.scm (<session-type>): New record type.
  (%windowmaker-session-type, %ratpoison-session-type): New variables.
  (%default-xsessions): Use them.
  (xsessions-directory): Expect SESSIONS to be a list of <session-type>
  and rewrite accordingly.
  (slim-service): Adjust docstring.
* doc/guix.texi (X Window): Update accordingly.
e87f0591 — Ludovic Courtès 11 years ago
monads: Move '%store-monad' and related procedures where they belong.

This turns (guix monads) into a generic module for monads, and moves the
store monad and related monadic procedures in their corresponding
module.

* guix/monads.scm (store-return, store-bind, %store-monad, store-lift,
  text-file, interned-file, package-file, package->derivation,
  package->cross-derivation, origin->derivation, imported-modules,
  compiled, modules, built-derivations, run-with-store): Move to...
* guix/store.scm (store-return, store-bind, %store-monad, store-lift,
  text-file, interned-file): ... here.
  (%guile-for-build): New variable.
  (run-with-store): Moved from monads.scm.  Remove default value for
  #:guile-for-build.
* guix/packages.scm (default-guile): Export.
  (set-guile-for-build): New procedure.
  (package-file, package->derivation, package->cross-derivation,
  origin->derivation): Moved from monads.scm.
* guix/derivations.scm (%guile-for-build): Remove.
  (imported-modules): Rename to...
  (%imported-modules): ... this.
  (compiled-modules): Rename to...
  (%compiled-modules): ... this.
  (built-derivations, imported-modules, compiled-modules): New
  procedures.
* gnu/services/avahi.scm, gnu/services/base.scm, gnu/services/dbus.scm,
  gnu/services/dmd.scm, gnu/services/networking.scm,
  gnu/services/ssh.scm, gnu/services/xorg.scm, gnu/system/install.scm,
  gnu/system/linux-initrd.scm, gnu/system/shadow.scm, guix/download.scm,
  guix/gexp.scm, guix/git-download.scm, guix/profiles.scm,
  guix/svn-download.scm, tests/monads.scm: Adjust imports accordingly.
* guix/monad-repl.scm (default-guile-derivation): New procedure.
  (store-monad-language, run-in-store): Use it.
* build-aux/hydra/gnu-system.scm (qemu-jobs): Add explicit
  'set-guile-for-build' call.
* guix/scripts/archive.scm (derivation-from-expression): Likewise.
* guix/scripts/build.scm (options/resolve-packages): Likewise.
* guix/scripts/environment.scm (guix-environment): Likewise.
* guix/scripts/system.scm (guix-system): Likewise.
* doc/guix.texi (The Store Monad): Adjust module names accordingly.
8cbb67e0 — Mark H Weaver 11 years ago
Merge branch 'master' into core-updates
f9930cfa — Mark H Weaver 11 years ago
Merge branch 'xorg-updates'
763a401e — Ludovic Courtès 11 years ago
Merge branch 'master' into core-updates
073cd609 — Mark H Weaver 11 years ago
gnu: xorg-server: Update to 1.16.2.901, with many security fixes.

Includes fixes for CVE-2014-8091, CVE-2014-8092, CVE-2014-8093, CVE-2014-8094,
CVE-2014-8095, CVE-2014-8096, CVE-2014-8097, CVE-2014-8098, CVE-2014-8099,
CVE-2014-8100, CVE-2014-8101, CVE-2014-8102, and CVE-2014-8103.

See <http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/>

* gnu/packages/xorg.scm (xorg-server): Update to 1.16.2.901.  Move mesa,
  resourceproto, scrnsaverproto, and xf86driproto from inputs to
  propagated-inputs.  Add dri3proto and presentproto to propagated-inputs.
  Add eudev and libxshmfence to inputs.  Add a 'pre-configure' phase instead
  of modifying the 'configure' phase.  Adapt substitution that avoids trying
  to 'mkdir /var' to build system changes.

* gnu/services/xorg.scm (xserver.conf): Add xf86-input-evdev ModulePath line.
3fc4eb21 — Mark H Weaver 11 years ago
gnu: xf86-video-modesetting: Now uses the same libdrm as mesa.

* gnu/packages/xorg.scm (xf86-video-modesetting): Remove a comment stating
  that the libdrm used in this driver is incompatible with the one in mesa,
  because it is no longer true.
* gnu/services/xorg.scm (xserver.conf): Uncomment 'xf86-video-modesetting'
  ModulePath and remove associated comment.
24d56899 — 宋文武 11 years ago
services: xorg: Make SLiM sessions configurable.

* gnu/services/xorg.scm (%default-xsessions): New variable.
  (xsessions-directory): New procedure.
  (slim-service): Add #:sessions and #:auto-login-session parameters.
  [slim.cfg]: Honor #:sessions.
  (xinitrc): Adjust accordingly.
Next