Branch: refs/heads/release-15.09
Home: https://github.com/NixOS/nixpkgs
Commit: 178f4e7753e3d2b03444350f144d550f0e2feeaa
https://github.com/NixOS/nixpkgs/commit/178f4e7753e3d2b03444350f144d550f0e2feeaa
Author: Vladimír Čunát <[email protected]>
Date: 2015-09-23 (Wed, 23 Sep 2015)
Changed paths:
M doc/functions.xml
M nixos/modules/services/x11/display-managers/gdm.nix
M nixos/modules/services/x11/display-managers/kdm.nix
M pkgs/applications/audio/audacious/default.nix
M pkgs/applications/audio/bristol/default.nix
M pkgs/applications/audio/distrho/default.nix
M pkgs/applications/audio/eq10q/default.nix
M pkgs/applications/audio/jaaa/default.nix
M pkgs/applications/audio/qmmp/default.nix
M pkgs/applications/audio/rkrlv2/default.nix
M pkgs/applications/audio/spotify/default.nix
M pkgs/applications/audio/tetraproc/default.nix
M pkgs/applications/display-managers/lightdm/default.nix
M pkgs/applications/editors/atom/default.nix
M pkgs/applications/editors/emacs-24/default.nix
M pkgs/applications/editors/lighttable/default.nix
M pkgs/applications/editors/nedit/default.nix
M pkgs/applications/editors/sublime/default.nix
M pkgs/applications/editors/sublime3/default.nix
M pkgs/applications/gis/qgis/default.nix
M pkgs/applications/graphics/feh/default.nix
M pkgs/applications/graphics/gimp/2.8.nix
M pkgs/applications/graphics/xfig/default.nix
M pkgs/applications/inferno/default.nix
M pkgs/applications/kde-apps-15.04/default.nix
M pkgs/applications/misc/evilvte/default.nix
M pkgs/applications/misc/finalterm/default.nix
M pkgs/applications/misc/keepassx/2.0.nix
M pkgs/applications/misc/synergy/default.nix
M pkgs/applications/misc/wordnet/default.nix
M pkgs/applications/misc/xcruiser/default.nix
M pkgs/applications/misc/xfe/default.nix
M pkgs/applications/misc/xpdf/default.nix
M pkgs/applications/networking/browsers/elinks/default.nix
M pkgs/applications/networking/browsers/firefox/default.nix
M
pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
M pkgs/applications/networking/browsers/w3m/default.nix
M pkgs/applications/networking/instant-messengers/amsn/default.nix
M pkgs/applications/networking/instant-messengers/hipchat/default.nix
M pkgs/applications/networking/instant-messengers/teamspeak/client.nix
M pkgs/applications/networking/instant-messengers/tkabber/default.nix
M pkgs/applications/networking/instant-messengers/viber/default.nix
M pkgs/applications/networking/mailreaders/thunderbird/default.nix
M pkgs/applications/office/mendeley/default.nix
M pkgs/applications/office/zotero/default.nix
M pkgs/applications/science/math/mathematica/9.nix
M pkgs/applications/science/math/mathematica/default.nix
M pkgs/applications/science/math/scilab/default.nix
M pkgs/applications/science/misc/openmodelica/default.nix
M pkgs/applications/version-management/git-and-tools/default.nix
M pkgs/applications/video/gnash/default.nix
M pkgs/applications/video/mythtv/default.nix
M pkgs/applications/video/tvtime/default.nix
M pkgs/applications/video/vlc/default.nix
M pkgs/applications/video/xine-ui/default.nix
M pkgs/applications/virtualization/open-vm-tools/default.nix
M pkgs/applications/virtualization/xen/generic.nix
M pkgs/applications/window-managers/awesome/default.nix
M pkgs/applications/window-managers/ion-3/default.nix
M pkgs/applications/window-managers/notion/default.nix
M pkgs/applications/window-managers/qtile/default.nix
M pkgs/applications/window-managers/weston/default.nix
M pkgs/data/documentation/zeal/default.nix
M pkgs/desktops/e19/efl.nix
M pkgs/desktops/e19/enlightenment.nix
M pkgs/desktops/enlightenment/default.nix
M pkgs/desktops/gnome-2/platform/gtkglext/default.nix
M pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
M pkgs/desktops/plasma-5.3/default.nix
M pkgs/development/compilers/cudatoolkit/generic.nix
M pkgs/development/compilers/ocaml/3.08.0.nix
M pkgs/development/compilers/ocaml/3.10.0.nix
M pkgs/development/compilers/ocaml/3.11.2.nix
M pkgs/development/compilers/ocaml/3.12.1.nix
M pkgs/development/compilers/ocaml/4.00.1.nix
M pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
M pkgs/development/compilers/ocaml/metaocaml-3.09.nix
M pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
M pkgs/development/compilers/oraclejdk/jdk6-linux.nix
M pkgs/development/haskell-modules/default.nix
M pkgs/development/interpreters/erlang/R15.nix
M pkgs/development/interpreters/erlang/R16.nix
M pkgs/development/interpreters/erlang/R17.nix
M pkgs/development/interpreters/erlang/R18.nix
M pkgs/development/interpreters/pypy/default.nix
M pkgs/development/interpreters/python/2.6/default.nix
M pkgs/development/interpreters/python/2.7/default.nix
M pkgs/development/interpreters/self/default.nix
M pkgs/development/interpreters/xulrunner/default.nix
M pkgs/development/libraries/SDL/default.nix
M pkgs/development/libraries/SDL2/default.nix
M pkgs/development/libraries/Xaw3d/default.nix
M pkgs/development/libraries/at-spi2-atk/default.nix
M pkgs/development/libraries/cairo/default.nix
M pkgs/development/libraries/cairomm/default.nix
M pkgs/development/libraries/directfb/default.nix
M pkgs/development/libraries/dlib/default.nix
M pkgs/development/libraries/fltk/default.nix
M pkgs/development/libraries/fltk/fltk13.nix
M pkgs/development/libraries/fox/default.nix
M pkgs/development/libraries/fox/fox-1.6.nix
M pkgs/development/libraries/frame/default.nix
M pkgs/development/libraries/freeglut/default.nix
M pkgs/development/libraries/geis/default.nix
M pkgs/development/libraries/giblib/default.nix
M pkgs/development/libraries/glew/default.nix
M pkgs/development/libraries/glfw/3.x.nix
M pkgs/development/libraries/grail/default.nix
M pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
M pkgs/development/libraries/gtk+/2.x.nix
M pkgs/development/libraries/gtk+/3.x.nix
M pkgs/development/libraries/imlib2/default.nix
M pkgs/development/libraries/jasper/default.nix
M pkgs/development/libraries/kde-frameworks-5.10/default.nix
M pkgs/development/libraries/kde-frameworks-5.12/default.nix
M pkgs/development/libraries/libclxclient/default.nix
M pkgs/development/libraries/libcm/default.nix
M pkgs/development/libraries/lirc/default.nix
M pkgs/development/libraries/pango/default.nix
M pkgs/development/libraries/physics/geant4/default.nix
M pkgs/development/libraries/qt-3/default.nix
M pkgs/development/libraries/qt-5/5.4/qtbase.nix
M pkgs/development/libraries/snack/default.nix
M pkgs/development/libraries/wtk/default.nix
M pkgs/development/libraries/xcb-util-cursor/HEAD.nix
M pkgs/development/pharo/vm/default.nix
M pkgs/development/pure-modules/gl/default.nix
M pkgs/development/pure-modules/tk/default.nix
M pkgs/development/python-modules/pycairo/default.nix
M pkgs/development/r-modules/default.nix
M pkgs/development/tools/electron/default.nix
M pkgs/development/tools/node-webkit/nw11.nix
M pkgs/development/tools/node-webkit/nw12.nix
M pkgs/development/tools/node-webkit/nw9.nix
M pkgs/development/tools/selenium/server/default.nix
M pkgs/development/tools/thrust/default.nix
M pkgs/games/adom/default.nix
M pkgs/games/astromenace/default.nix
M pkgs/games/megaglest/default.nix
M pkgs/games/minetest/default.nix
M pkgs/games/planetaryannihilation/default.nix
M pkgs/games/quake3/game/default.nix
M pkgs/games/sdlmame/default.nix
M pkgs/games/snake4/default.nix
M pkgs/games/spring/default.nix
M pkgs/games/steam/chrootenv.nix
M pkgs/games/ue4demos/default.nix
M pkgs/games/ut2004demo/default.nix
M pkgs/games/voxelands/default.nix
M pkgs/games/zoom/default.nix
M pkgs/misc/emulators/snes9x-gtk/default.nix
M pkgs/misc/emulators/wine/base.nix
M pkgs/misc/ghostscript/default.nix
M pkgs/misc/screensavers/electricsheep/default.nix
M pkgs/misc/screensavers/rss-glx/default.nix
M pkgs/misc/screensavers/xautolock/default.nix
M pkgs/misc/themes/qtcurve/default.nix
M pkgs/os-specific/linux/ati-drivers/default.nix
M pkgs/os-specific/linux/conky/default.nix
M pkgs/os-specific/linux/nvidia-x11/beta.nix
M pkgs/os-specific/linux/nvidia-x11/default.nix
M pkgs/os-specific/linux/nvidia-x11/legacy173.nix
M pkgs/os-specific/linux/nvidia-x11/legacy304.nix
M pkgs/os-specific/linux/nvidia-x11/legacy340.nix
M pkgs/os-specific/linux/opengl/xorg-sys/default.nix
M pkgs/servers/pulseaudio/default.nix
M pkgs/tools/X11/primus/lib.nix
M pkgs/tools/X11/vdpauinfo/default.nix
M pkgs/tools/X11/xbrightness/default.nix
M pkgs/tools/X11/xinput_calibrator/default.nix
M pkgs/tools/X11/xrestop/default.nix
M pkgs/tools/admin/tightvnc/default.nix
M pkgs/tools/audio/pasystray/default.nix
M pkgs/tools/graphics/glmark2/default.nix
M pkgs/tools/graphics/glxinfo/default.nix
M pkgs/tools/graphics/graphviz/2.0.nix
M pkgs/tools/graphics/graphviz/2.32.nix
M pkgs/tools/graphics/graphviz/default.nix
M pkgs/tools/graphics/scrot/default.nix
M pkgs/tools/inputmethods/touchegg/default.nix
M pkgs/tools/misc/antimicro/default.nix
M pkgs/tools/misc/ocz-ssd-guru/default.nix
M pkgs/tools/misc/pipelight/default.nix
M pkgs/tools/misc/unclutter/default.nix
M pkgs/tools/misc/xclip/default.nix
M pkgs/tools/misc/xsel/default.nix
M pkgs/tools/networking/x11-ssh-askpass/default.nix
M pkgs/tools/security/tor/torbrowser.nix
M pkgs/top-level/all-packages.nix
M pkgs/top-level/perl-packages.nix
M pkgs/top-level/python-packages.nix
Log Message:
-----------
Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
(cherry picked from commit 76ef7a93e302a4a92954e4b40863c6702df5ac8d)
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
