summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingobadz2016-08-27
|\
| * navit: fix buildNikolay Amiantov2016-08-28
| * xsw: fix buildNikolay Amiantov2016-08-28
| * gravit: fix buildNikolay Amiantov2016-08-28
| * pokerth: fix buildNikolay Amiantov2016-08-28
| * SDL_ttf: don't link itself to /includeNikolay Amiantov2016-08-28
| * make-bootstrap-tools-cross.nix: Fix gcc build-time options for armv5telTuomas Tynkkynen2016-08-28
| * Merge pull request #17884 from garrison/vmtouch-1.1.0Joachim F2016-08-27
| |\
| | * vmtouch: 1.0.2 -> 1.1.0Jim Garrison2016-08-21
| * | qt5: use absolute paths to plugins in CMakeThomas Tuegel2016-08-27
| * | Merge pull request #18037 from patjouk/update-jabrefGabriel Ebner2016-08-27
| |\ \
| | * | jabref: 3.5 -> 3.6patjouk2016-08-27
| * | | Merge pull request #17906 from garbas/neovim-0.1.5-updateRok Garbas2016-08-27
| |\ \ \
| | * | | pythonPackages.trollius: skip one test from tests/test_subprocess.py (only on...Rok Garbas2016-08-22
| | * | | neovim: 0.1.4 -> 0.1.5 (and related dependencies)Rok Garbas2016-08-22
| * | | | chromium: fixup share/shareVladimír Čunát2016-08-27
| * | | | Merge #18013: gnumeric: 1.12.26 -> 1.12.32Vladimír Čunát2016-08-27
| |\ \ \ \
| | * | | | gnumeric: 1.12.26 -> 1.12.32Vincent Laporte2016-08-26
| | * | | | gnumeric: fix on darwinVincent Laporte2016-08-26
| * | | | | Updating mumble to 1.2.16.Lluís Batlle i Rossell2016-08-27
| * | | | | neural-style: init at 0.0pre2016.08.15Michael Raskin2016-08-27
| * | | | | loadcaffe: init at 0.0pre2016.08.01Michael Raskin2016-08-27
| * | | | | torch: find libjpeg and libpng, use compatible openblasMichael Raskin2016-08-27
| | |_|/ / | |/| | |
| * | | | Merge pull request #11484 from oxij/nixos-toposort-filesystemsNikolay Amiantov2016-08-27
| |\ \ \ \
| | * | | | nixos: generalize copy-paste from stage-1 and zfs to utilsJan Malakhovski2016-08-23
| | * | | | nixos: copy resize2fs only for stage-1 fileSystemsJan Malakhovski2016-08-23
| | * | | | nixos: apply toposort to fileSystems to support bind and move mountsJan Malakhovski2016-08-23
| | * | | | nixos: tasks/fileSystems: cleanupJan Malakhovski2016-08-23
| | * | | | Revert a soon to be useless pice of "nixos/stage-1: add mechanism which lustr...Jan Malakhovski2016-08-23
| | * | | | lib: introduce listDfs and toposort, add example to hasPrefixJan Malakhovski2016-08-23
| * | | | | Merge pull request #18022 from mboes/ghcHEADPeter Simons2016-08-27
| |\ \ \ \ \
| | * | | | | haskell.compiler.ghcHEAD: update to latest upstream (20160826).Mathieu Boespflug2016-08-26
| * | | | | | Merge pull request #18028 from rnhmjoj/imvJoachim F2016-08-27
| |\ \ \ \ \ \
| | * | | | | | imv: fix failing buildrnhmjoj2016-08-27
| * | | | | | | Merge pull request #18030 from Ralith/matrix-synapseJoachim F2016-08-27
| |\ \ \ \ \ \ \
| | * | | | | | | matrix-synapse: 0.17.0 -> 0.17.1Benjamin Saunders2016-08-26
| * | | | | | | | runit: support building with clangStdenvJoachim Fasting2016-08-27
| * | | | | | | | Revert "wine: use gcc49 for 64-bit builds"Ram Kromberg2016-08-27
| * | | | | | | | Merge pull request #18033 from markus1189/source-code-pro-2.030Robin Gloster2016-08-27
| |\ \ \ \ \ \ \ \
| | * | | | | | | | source-code-pro: 2.010 -> 2.030Markus Hauck2016-08-27
| * | | | | | | | | Merge pull request #18032 from erikryb/masterRobin Gloster2016-08-27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | neomutt: 20160723 -> 20160827Erik Rybakken2016-08-27
| | |/ / / / / / / /
| * | | | | | | | | Merge pull request #17996 from Ptival/vscode-1.4.0Joachim F2016-08-27
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | vscode: 1.2.1 -> 1.4.0Valentin Robert2016-08-25
| * | | | | | | | | | Merge pull request #18017 from joachifm/tor-0_2_8_7Joachim F2016-08-27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tor: 0.2.7.6 -> 0.2.8.7Joachim Fasting2016-08-26
| * | | | | | | | | | | Merge pull request #18020 from joachifm/runit-refactorJoachim F2016-08-27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | runit: refactor, add man outputJoachim Fasting2016-08-26
| * | | | | | | | | | | | refind: 0.9.2 -> 0.10.3, fix buildJoachim Fasting2016-08-27
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | perf: unbreak build since glibc 2.24 upgradeBjørn Forsman2016-08-27