Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | treewide: Make explicit that 'dev' output of glib is used | Tuomas Tynkkynen | 2016-05-19 | |
|/ | ||||
* | xfce4: rename application xfce4screenshooter to xfce4-screenshooter | José Romildo Malaquias | 2016-05-15 | |
| | ||||
* | Merge pull request #15024 from abbradar/xfce-no-desktop | Nikolay Amiantov | 2016-05-14 | |
|\ | | | | | xfce service: add noDesktop option | |||
| * | xfce service: add noDesktop option | Nikolay Amiantov | 2016-04-27 | |
| | | ||||
* | | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-12 | |
|\ \ | ||||
| * | | unclutter: prevent service restarting too soon | rnhmjoj | 2016-05-09 | |
| | | | ||||
* | | | Merge branch 'master' into staging | Vladimír Čunát | 2016-05-08 | |
|\| | | ||||
| * | | Merge pull request #15228 from rnhmjoj/master | Joachim Fasting | 2016-05-05 | |
| |\ \ | | | | | | | | | unclutter: switch to user service and add options | |||
| | * | | unclutter: switch to user service and add options | rnhmjoj | 2016-05-04 | |
| | | | | ||||
* | | | | Merge #14920: windows improvements, mainly mingw | Vladimír Čunát | 2016-05-05 | |
|\| | | | ||||
| * | | | bspwm: add _JAVA_AWT_WM_NONREPARENTING=1 | Mitchell Pleune | 2016-05-03 | |
| |/ / | | | | | | | | | | | | | bspwm is not in java's internal list of non-reparrenting window managers. See https://awesomewm.org/wiki/Problems_with_Java | |||
* | | | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2016-05-03 | |
|\| | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/networking/browsers/vivaldi/default.nix pkgs/misc/emulators/wine/base.nix | |||
| * | | Merge pull request #14741 from cruegge/dbus-activation-environment | Thomas Tuegel | 2016-05-01 | |
| |\ \ | | | | | | | | | xsession: Update DBus activation environment | |||
| | * | | xsession: make updating DBus environment optional | Christoph Ruegge | 2016-04-25 | |
| | | | | ||||
| | * | | xsession: Update DBus activation environment | Christoph Ruegge | 2016-04-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `dbus-launch` is executed early in the script, before desktop managers had a chance to setup the environment. If DBus activation is used, applications launched by this may therefore lack necessary environment variables. This patch sends the complete environment to DBus after launching the desktop manager. | |||
| * | | | Revert "pulseaudio: select correct outputs" | Nikolay Amiantov | 2016-04-28 | |
| | | | | | | | | | | | | | | | | This reverts commit 5e2bb0b31c892fed5024eaf7e93faf470a6ceb38. | |||
| * | | | pulseaudio: select correct outputs | Nikolay Amiantov | 2016-04-28 | |
| | |/ | |/| | | | | | | | Original fixes by ttuegel and peterhoeg. | |||
* | | | kde5: don't install GStreamer modules system-wide | Thomas Tuegel | 2016-04-30 | |
| | | | ||||
* | | | pulseaudio: select correct outputs | Nikolay Amiantov | 2016-04-28 | |
| | | | | | | | | | | | | Original fixes by ttuegel and peterhoeg. | |||
* | | | nixos/kde5: phonon-backend-gstreamer is not optional | Thomas Tuegel | 2016-04-25 | |
| | | | ||||
* | | | nixos/kde5: install kactivitymanagerd | Thomas Tuegel | 2016-04-25 | |
| | | | ||||
* | | | Merge commit 'refs/pull/14694/head' of git://github.com/NixOS/nixpkgs into ↵ | Nikolay Amiantov | 2016-04-25 | |
|\ \ \ | | | | | | | | | | | | | staging | |||
| * | | | makeSearchPathOutputs: refactor to makeSearchPathOutput | Nikolay Amiantov | 2016-04-25 | |
| |/ / | ||||
* | | | Merge branch 'master' of git://github.com/NixOS/nixpkgs into staging | Nikolay Amiantov | 2016-04-25 | |
|\| | | ||||
| * | | redshift service: run as user service | Franz Pletz | 2016-04-24 | |
| | | | | | | | | | | | | Fixes #14882. | |||
* | | | phonon-backend-vlc: init at 0.9.0 | Thomas Tuegel | 2016-04-22 | |
| | | | ||||
* | | | phonon: 4.8.3 -> 4.9.0 | Thomas Tuegel | 2016-04-22 | |
|/ / | | | | | | | | | - Removed phonon-backend-vlc. - Moved qt5.phonon to kde5.phonon. | |||
* / | kde5.startkde: init at 5.5.5 | Thomas Tuegel | 2016-04-20 | |
|/ | ||||
* | replace makeSearchPath tree-wise to take care of possible multiple outputs | Nikolay Amiantov | 2016-04-13 | |
| | ||||
* | Merge branch 'staging', containing closure-size #7701 | Vladimír Čunát | 2016-04-13 | |
|\ | ||||
| * | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-10 | |
| |\ | | | | | | | | | | | | | | | | Comparison to master evaluations on Hydra: - 1255515 for nixos - 1255502 for nixpkgs | |||
| * \ | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-04-01 | |
| |\ \ | | | | | | | | | | | | | | | | | Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts. | |||
| * \ \ | Merge master into closure-size | Vladimír Čunát | 2016-03-08 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems. | |||
| * \ \ \ | Merge branch 'master' into closure-size | Vladimír Čunát | 2016-02-14 | |
| |\ \ \ \ | ||||
| * \ \ \ \ | Merge #12740: multiple outputs for Qt 5 and KDE 5 | Vladimír Čunát | 2016-02-03 | |
| |\ \ \ \ \ | ||||
| | * | | | | | nixos/kde5: use runtime outputs | Thomas Tuegel | 2016-01-31 | |
| | | | | | | | ||||
| * | | | | | | Merge recent 'staging' into closure-size | Vladimír Čunát | 2016-02-03 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | Let's get rid of those merge conflicts. | |||
| * | | | | | | treewide: Mass replace 'xorg.libXext}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 | |
| | | | | | | | ||||
| * | | | | | | treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output | Tuomas Tynkkynen | 2016-01-24 | |
| | | | | | | | ||||
| * | | | | | | Merge branch 'staging' into closure-size | Vladimír Čunát | 2016-01-19 | |
| |\ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into closure-size | Vladimír Čunát | 2015-12-31 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later. | |||
| * \ \ \ \ \ \ \ | Merge branch 'master' into closure-size | Luca Bruno | 2015-12-11 | |
| |\ \ \ \ \ \ \ \ | ||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into closure-size | Luca Bruno | 2015-11-25 | |
| |\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | nixos/xserver: fix missing modules after splitting | Vladimír Čunát | 2015-11-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... xorg-server in e25da7e5. | |||
| * | | | | | | | | | | Merge staging into closure-size | Vladimír Čunát | 2015-11-20 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most complex problems were from dealing with switches reverted in the meantime (gcc5, gmp6, ncurses6). It's likely that darwin is (still) broken nontrivially. | |||
| * | | | | | | | | | | | treewide: Mass-replace 'xorgserver}/bin' with correct output | Tuomas Tynkkynen | 2015-10-28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vcunat added one fix in xdummy. | |||
| * | | | | | | | | | | | dbus: split into multiple outputs and fix referrers | Vladimír Čunát | 2015-10-13 | |
| | | | | | | | | | | | | ||||
| * | | | | | | | | | | | glib-networking: split the dev output | Vladimír Čunát | 2015-10-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That's done to get rid of propagatedBuildInputs from regular closure. Also references were fixed, mainly to its gio modules. | |||
| * | | | | | | | | | | | pulseaudio: split the "dev" output | Vladimír Čunát | 2015-10-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is meant mainly for the `libpulseaudio` attribute. | |||
| * | | | | | | | | | | | gtk3: split into multiple outputs | Vladimír Čunát | 2015-10-13 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All references OK, hopefully. Seems surprisingly smooth. |