summary refs log tree commit diff
path: root/pkgs/desktops
Commit message (Collapse)AuthorAge
* Merge branch 'master' into stagingobadz2016-08-28
|\ | | | | | | | | Conflicts: pkgs/games/scummvm/default.nix
| * gitg: use wrapGAppsHook, pull in dconf (#18040)Benjamin Herr2016-08-28
| | | | | | Without dconf, gitg doesn't remember preferences such as window size.
* | Merge branch 'master' into stagingobadz2016-08-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix
| * kde5.startkde: initialize session variables before loading user envThomas Tuegel2016-08-26
| | | | | | | | | | | | | | | | The desktop session variables need to be initialized before loading the user environment scripts so that these scripts can exec programs that rely on the session variables. For example, these variables must be set when gpg-agent is started or pinentry-qt will not respect the user's theme settings.
| * Merge pull request #17941 from romildo/upd.eflJoachim F2016-08-26
| |\ | | | | | | efl: 1.17.2 -> 1.18.0
| | * efl: remove elementary, evas and emotion, as they are integrated into efl-0.18.0José Romildo Malaquias2016-08-23
| | |
| | * enlightenment: adapt for efl-0.18.0José Romildo Malaquias2016-08-23
| | |
| | * rage: 0.1.4 -> 0.2.0José Romildo Malaquias2016-08-23
| | |
| | * econnman: adapt for efl-1.18.0José Romildo Malaquias2016-08-23
| | |
| | * terminology: adapt for efl-1.18.0José Romildo Malaquias2016-08-23
| | |
| | * enlightenment: 0.21.1 -> 0.21.2José Romildo Malaquias2016-08-23
| | |
| | * efl: 1.17.2 -> 1.18.0José Romildo Malaquias2016-08-23
| | |
| * | Merge pull request #18003 from peterhoeg/kdfFrederik Rietdijk2016-08-26
| |\ \ | | | | | | | | kdiskfree: init at 16.08.0
| | * | kdiskfree: init at 16.08.0Peter Hoeg2016-08-26
| | | |
| * | | eog: 3.20.3 -> 3.20.4 (security)Franz Pletz2016-08-25
| | | | | | | | | | | | | | | | Fixes CVE-2016-6855.
| * | | kde5.plasma: 5.7.3 -> 5.7.4Thomas Tuegel2016-08-25
| | | |
| * | | fetch-kde-qt.sh: modularize script allowing multiple versionsThomas Tuegel2016-08-25
| |/ /
| * | Merge pull request #17950 from myguidingstar/masterGraham Christensen2016-08-25
| |\ \ | | | | | | | | yelp: adding groff to build inputs for man pages
| | * | yelp: adding groff to build inputs for man pagesHoàng Minh Thắng2016-08-25
| | | |
| * | | kdelibs: remove setup hookThomas Tuegel2016-08-24
| |/ / | | | | | | | | | | | | | | | | | | Fixes #17346. The kdelibs setup hook unnecessarily propagates kdelibs into the system environment, leading to KDE 4 services running in a KDE 5 session.
* | | Merge branch 'master' into stagingobadz2016-08-23
|\| |
| * | gnome3.gnome-calculator: less hacky fix to #17912obadz2016-08-23
| | | | | | | | | | | | Closes #17912
| * | Revert "gnome-calculator: work around #17912, in a hacky way"obadz2016-08-23
| | | | | | | | | | | | This reverts commit c2553952195cb390c9ae65e2a31ad02cc82d0f76.
| * | kde5.startkde: actually check that D-Bus is runningThomas Tuegel2016-08-23
| | |
| * | kde5.startkde: update from plasma-workspace-5.7.3Thomas Tuegel2016-08-23
| |/ | | | | | | | | | | | | | | * Read the screen scale factor (for HiDPI displays) from KScreen correctly. * Disable automaticy scale factor detection in Qt applications. * Force font DPI at startup, if requested. * Allow kded to invoke kbuildsycoca5 automatically.
| * glib: Add some FIXMEs about inappropriate outputsTuomas Tynkkynen2016-08-23
| |
| * treewide: Fix output references to glibTuomas Tynkkynen2016-08-23
| |
| * treewide: Fix output references to gtk3Tuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of glib is usedTuomas Tynkkynen2016-08-23
| |
| * gnome-user-share: Fix apache pathsTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of poppler is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of nspr (and glib) is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of gst_all_1.gst-plugins-base is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of gnome3.glib is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of dbus_libs is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Make explicit that 'dev' output of dbus_glib is usedTuomas Tynkkynen2016-08-23
| |
| * treewide: Use more makeLibraryPathTuomas Tynkkynen2016-08-23
| |
| * treewide: Use makeBinPathTuomas Tynkkynen2016-08-23
| |
| * gnome-calculator: work around #17912, in a hacky wayVladimír Čunát2016-08-22
| |
* | Merge branch 'hardened-stdenv' into stagingobadz2016-08-22
|\ \ | |/ |/| | | | | | | | | Closes #12895 Amazing work by @globin & @fpletz getting hardened compiler flags by enabled default on the whole package set
| * Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-16
| |\
| * \ Merge branch 'master' into hardened-stdenvFranz Pletz2016-08-13
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-12
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-03
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-02
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-31
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-25
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-21
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-07-15
| |\ \ \ \ \ \ \ \ \ \