about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingLuca Bruno2014-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
| * Merge pull request #4870 from bosu/docker-proxyJaka Hudoklin2014-11-08
| |\
| | * docker: propagate nix.proxy into daemon environmentBoris Sukholitko2014-11-07
| * | Revert "Revert "syslog-ng: Update from 3.5.6 to 3.6.1""Rickard Nilsson2014-11-06
| * | Fixes to Apache 2.4 configurationRickard Nilsson2014-11-06
| * | apache-httpd: Make 2.4 the defaultEelco Dolstra2014-11-06
| * | thermald needs dbus config files to runEvgeny Egorochkin2014-11-06
* | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-11-06
|\| |
| * | Merge pull request #4838 from abbradar/ssmtp-rootPeter Simons2014-11-05
| |\ \
| | * | ssmtp: add 'root' optionNikolay Amiantov2014-11-05
| | * | ssmtp: add types to optionsNikolay Amiantov2014-11-05
* | | | Merge recent master into stagingVladimír Čunát2014-11-05
|\| | |
| * | | nixos/graphite: fix user creationJaka Hudoklin2014-11-04
| * | | nixos/transmission: Start after local-fs.targetRicardo M. Correia2014-11-04
| * | | Fix tests.runInMachine evaluationEelco Dolstra2014-11-04
| * | | nixos: Fix priorities of initialHashedPassword.aszlig2014-11-04
| * | | Merge pull request #4801 from robberer/pkgs/zabbix-serverlethalman2014-11-04
| |\ \ \
| | * | | zabbix-server: add extraConfig optionLongrin Wischnewski2014-11-03
| * | | | Merge pull request #4238 from wkennington/master.boostPeter Simons2014-11-03
| |\ \ \ \
| | * | | | Revert "syslog-ng: Update from 3.5.6 to 3.6.1"William A. Kennington III2014-11-02
| | * | | | jfsrec: Remove derivationWilliam A. Kennington III2014-11-02
| | |/ / /
| * | | | Obsolete security.initialPasswordEelco Dolstra2014-11-03
| * | | | Handle initialPassword and initialHashedPassword for !mutableUsersEelco Dolstra2014-11-03
| * | | | Handle removing a password if mutableUsers = falseEelco Dolstra2014-11-03
| * | | | Add initialPassword and initialHashedPassword optionsEelco Dolstra2014-11-03
| |/ / /
| * | | nixos: installation: make installation ISOs USB bootableBob van der Linden2014-11-02
| * | | nixos: iso-image: use syslinux bootloader for USB booting supportBob van der Linden2014-11-02
| * | | Merge pull request #4742 from abbradar/bcache-stage1lethalman2014-11-02
| |\ \ \
| | * | | stage-1: add bcache supportNikolay Amiantov2014-11-02
| * | | | nixos: increase allocated memory for gnome tests. Closes #4651Luca Bruno2014-11-02
* | | | | fontconfig: patch and documentVladimír Čunát2014-11-05
* | | | | Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-11-02
|\| | | |
| * | | | sudo: allow adding extra configuration options to the bottom of sudoersMathijs Kwik2014-11-02
| * | | | nixos/modules/services/monitoring/graphite.nix: strip trailing whitespacePeter Simons2014-11-02
| * | | | nixos/modules/services/monitoring/graphite.nix: don't create graphite user un...Peter Simons2014-11-02
| * | | | gitolite: add dataDirNikolay Amiantov2014-11-02
| | |/ / | |/| |
| * | | Merge pull request #4750 from abbradar/nix-maxcoreslethalman2014-11-01
| |\ \ \ | | |_|/ | |/| |
| | * | nix-daemon: add maxCores optionNikolay Amiantov2014-11-01
| * | | nixos/nat: Fix override so that sysctls are properly preservedWilliam A. Kennington III2014-10-31
| * | | update-users-groups.pl: Generate hashed passwords internallyEelco Dolstra2014-10-31
* | | | Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-10-31
|\| | |
| * | | Merge pull request #4746 from abbradar/synaptics-fingersPeter Simons2014-10-31
| |\ \ \ | | |/ / | |/| |
| | * | synaptics: add fingersMap optionNikolay Amiantov2014-10-31
| | * | synaptics: add types to optionsNikolay Amiantov2014-10-31
| * | | rsnapshot: add git version & make it configurable in the nixos moduleAristid Breitkreuz2014-10-27
| * | | xsession: Start the right pulseaudio binaryKirill Elagin2014-10-27
| * | | syslog-ng: Update from 3.5.6 to 3.6.1Rickard Nilsson2014-10-27