summary refs log tree commit diff
path: root/pkgs/top-level
Commit message (Expand)AuthorAge
* Merge pull request #15420 from samuelrivas/emacs-wrapperThomas Tuegel2016-05-13
|\
| * emacs: hide wrapper dependenciesSamuel Rivas2016-05-12
* | Merge pull request #15430 from mdorman/emacs-revertThomas Tuegel2016-05-13
|\ \
| * | Revert "Remove obsolete pcache version"Michael Alan Dorman2016-05-13
| * | Revert "Remove obsolete s version"Michael Alan Dorman2016-05-13
| * | Revert "Remove obsolete xml-rpc version"Michael Alan Dorman2016-05-13
* | | pythonPackages.aws_shell: use futures 3.0, not 2.2Frederik Rietdijk2016-05-13
|/ /
* | Merge branch 'staging'Vladimír Čunát2016-05-13
|\ \
| * \ Merge branch 'master' into stagingVladimír Čunát2016-05-12
| |\ \
| * | | kde5: unpin from Qt 5.5Thomas Tuegel2016-05-10
| * | | signon: remove obsolete aliasThomas Tuegel2016-05-09
| * | | golden-cheetah: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | redis-desktop-manager: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | ricochet: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | rapcad: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | smtube: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | musescore: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | luminanceHDR: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | keyfinder: unpin from Qt 5.5Thomas Tuegel2016-05-09
| * | | zeal: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | libcommuni: add to qtLibsFunThomas Tuegel2016-05-09
| * | | sigil: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | cool-retro-term: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | apitrace: pin at Qt 5.5Thomas Tuegel2016-05-09
| * | | qtcreator: build only onceThomas Tuegel2016-05-09
| * | | signon: removeThomas Tuegel2016-05-09
| * | | qmltermwidget: incompatible with Qt 5.6Thomas Tuegel2016-05-09
| * | | Remove Qt 5.4.2Thomas Tuegel2016-05-09
| * | | qt5: 5.4.2 -> 5.6.0Thomas Tuegel2016-05-09
| * | | qt56: init at 5.6.0Thomas Tuegel2016-05-09
| * | | Merge branch 'master' into stagingVladimír Čunát2016-05-08
| |\ \ \
| * \ \ \ Merge #14920: windows improvements, mainly mingwVladimír Čunát2016-05-05
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2016-05-03
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2016-04-28
| |\ \ \ \ \ \
| * | | | | | | fuse-zip: Add dashed variant (and one with underscore for compat)Tuomas Tynkkynen2016-04-27
| * | | | | | | kde5_latest -> kde5Thomas Tuegel2016-04-25
| * | | | | | | kde5_latest.plasma: 5.5.5 -> 5.6.3Thomas Tuegel2016-04-25
| * | | | | | | kde5_latest.applications: 15.12.03 -> 16.04.0Thomas Tuegel2016-04-25
| * | | | | | | kde5_latest.frameworks: 5.19 -> 5.21Thomas Tuegel2016-04-25
| * | | | | | | Merge branch 'master' of git://github.com/NixOS/nixpkgs into stagingNikolay Amiantov2016-04-25
| |\ \ \ \ \ \ \
| * | | | | | | | aliases: remove phonon aliasesThomas Tuegel2016-04-22
| * | | | | | | | phonon-backend-vlc: init at 0.9.0Thomas Tuegel2016-04-22
| * | | | | | | | phonon: 4.8.3 -> 4.9.0Thomas Tuegel2016-04-22
* | | | | | | | | Merge pull request #15414 from teh/daskFrederik Rietdijk2016-05-12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | distributed: init at 1.10.0Tom Hunger2016-05-12
| * | | | | | | | | tblib: init at 1.3.0Tom Hunger2016-05-12
| * | | | | | | | | s3fs: init at 0.0.4Tom Hunger2016-05-12
| * | | | | | | | | locket: init at 0.2.0Tom Hunger2016-05-12
| * | | | | | | | | dask: 0.7.6 -> 0.9.0Tom Hunger2016-05-12
| * | | | | | | | | tornado: disable tests, see #14634Tom Hunger2016-05-12