summary refs log tree commit diff
Commit message (Expand)AuthorAge
* Merge pull request #4834 from offlinehacker/pkgs/flannel/addAristid Breitkreuz2014-11-08
|\
| * Add flannel, etcd backed network fabric for containersJaka Hudoklin2014-11-04
* | rubber: Disable etex detection.Vladimir Still2014-11-08
* | tomcat-connectors: 1.2.32 -> 1.2.40Domen Kožar2014-11-08
* | Merge pull request #4822 from abbradar/crawlAristid Breitkreuz2014-11-08
|\ \
| * | crawl: fix, update, add console versionNikolay Amiantov2014-11-04
* | | nixos-rebuild: reload dbus before starting other units. Closes #4546Luca Bruno2014-11-08
* | | Merge pull request #4823 from abbradar/synaptics-fixAristid Breitkreuz2014-11-08
|\ \ \
| * | | synaptics: fix tapButtons settingNikolay Amiantov2014-11-04
| |/ /
* | | Merge pull request #4859 from abbradar/git-daemonAristid Breitkreuz2014-11-08
|\ \ \
| * | | nixos/git-daemon: fix 'exportAll' optionNikolay Amiantov2014-11-07
| * | | nixos/git-daemon: add 'user' and 'group' optionsNikolay Amiantov2014-11-07
| * | | nixos/git-daemon: add typesNikolay Amiantov2014-11-07
| |/ /
* | | Merge pull request #4891 from pSub/prefer-xresourcesDomen Kožar2014-11-08
|\ \ \
| * | | Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670Pascal Wittmann2014-11-08
* | | | update-users-groups.pl: Use UTF-8 instead of latin1.Rüdiger Sonderfeld2014-11-08
* | | | emacs-ess: update checksum of the tarballPeter Simons2014-11-08
* | | | FileZilla: update from 3.8.1 to 3.9.0.6Vincent Laporte2014-11-08
* | | | klavaro: update from 2.00 to 3.01Vincent Laporte2014-11-08
* | | | pycdio: fix buildDomen Kožar2014-11-08
* | | | Merge pull request #4895 from joachifm/ess-14_09Peter Simons2014-11-08
|\ \ \ \
| * | | | ess: bump version to 14.09Joachim Fasting2014-11-08
* | | | | Fixes ocamlscriptVincent Laporte2014-11-08
* | | | | quassel: make a proper systemd unit (also properly works in containers now)Aristid Breitkreuz2014-11-08
* | | | | Revert "nixos: iso-image: use syslinux bootloader for USB booting support"Luca Bruno2014-11-08
* | | | | Revert "nixos: installation: make installation ISOs USB bootable"Luca Bruno2014-11-08
* | | | | fix libreoffice buildDomen Kožar2014-11-08
* | | | | Merge pull request #4870 from bosu/docker-proxyJaka Hudoklin2014-11-08
|\ \ \ \ \
| * | | | | docker: propagate nix.proxy into daemon environmentBoris Sukholitko2014-11-07
* | | | | | fix ccnx buildDomen Kožar2014-11-08
* | | | | | Merge pull request #4780 from ambrop72/kernel-ppp-filterlethalman2014-11-08
|\ \ \ \ \ \
| * | | | | | kernel: Enable PPP_FILTER by default.ambrop7@gmail.com2014-11-02
* | | | | | | distributed-process-platform: add haskell packageNikolay Amiantov2014-11-08
* | | | | | | rematch: add haskell packageNikolay Amiantov2014-11-08
* | | | | | | kernel: Add more supported featuresWilliam A. Kennington III2014-11-08
* | | | | | | Merge pull request #4887 from vbgl/ocamlnetvbgl2014-11-08
|\ \ \ \ \ \ \
| * | | | | | | ocaml-http: update from 0.1.3 to 0.1.5Vincent Laporte2014-11-08
| * | | | | | | ocamlnet: update from 3.7.6 to 3.7.7Vincent Laporte2014-11-08
|/ / / / / / /
* | | | | | | lshw: fix location of the binaryMateusz Kowalczyk2014-11-08
* | | | | | | gmpc: fix missing dependenceArseniy Seroka2014-11-08
* | | | | | | Merge pull request #4882 from abbradar/follyArseniy Seroka2014-11-08
|\ \ \ \ \ \ \
| * | | | | | | folly: add packageNikolay Amiantov2014-11-08
| * | | | | | | libiberty: add packageNikolay Amiantov2014-11-08
| * | | | | | | double_conversion: add packageNikolay Amiantov2014-11-08
* | | | | | | | Merge pull request #4883 from abbradar/boost-processArseniy Seroka2014-11-08
|\ \ \ \ \ \ \ \
| * | | | | | | | boost_process: add packageNikolay Amiantov2014-11-08
| |/ / / / / / /
* | | | | | | | Merge pull request #4885 from abbradar/libxlsArseniy Seroka2014-11-08
|\ \ \ \ \ \ \ \
| * | | | | | | | libxls: add packageNikolay Amiantov2014-11-08
| |/ / / / / / /
* | | | | | | | Merge pull request #4884 from abbradar/xlslibArseniy Seroka2014-11-08
|\ \ \ \ \ \ \ \
| * | | | | | | | xlslib: add packageNikolay Amiantov2014-11-08
| |/ / / / / / /