summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Allow starting a shell on stage 1 failurewmertens2014-11-15
* Drop GNOME 3.10Luca Bruno2014-11-14
* nixos/unifi: Remove old ROOT.war links before relinkingWilliam A. Kennington III2014-11-14
* Merge branch 'staging'Eelco Dolstra2014-11-14
|\
| * Merge branch 'master' into stagingVladimír Čunát2014-11-14
| |\
| * | Fix /dev/root udev rule in the ISOEelco Dolstra2014-11-11
| * | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-11-11
| |\ \
| * \ \ Merge branch 'master' into stagingLuca Bruno2014-11-10
| |\ \ \
| * \ \ \ Merge branch 'master' into stagingLuca Bruno2014-11-08
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-11-06
| |\ \ \ \ \
| * \ \ \ \ \ Merge recent master into stagingVladimír Čunát2014-11-05
| |\ \ \ \ \ \
| * | | | | | | fontconfig: patch and documentVladimír Čunát2014-11-05
| * | | | | | | Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-11-02
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into staging.Peter Simons2014-10-31
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-24
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge recent master into stagingVladimír Čunát2014-10-23
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fontconfig: update 2.10.2 -> 2.11.1. Close #4410, #2050Luca Bruno2014-10-23
| * | | | | | | | | | | nixos: fix two pipefail problemsVladimír Čunát2014-10-19
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-07
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix nixos-rebuild evaluationLuca Bruno2014-09-23
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-09-18
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Merge recent master into stagingVladimír Čunát2014-09-13
| * | | | | | | | | | | | | | Change default from gnome 3.10 to gnome 3.12Luca Bruno2014-09-08
| * | | | | | | | | | | | | | Merge remote-tracking branch 'origin/systemd-216' into stagingEelco Dolstra2014-09-08
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into systemd-216Eelco Dolstra2014-09-02
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Enable systemd's mymachines NSS moduleEelco Dolstra2014-08-24
| | * | | | | | | | | | | | | | | NixOS containers: Use exit status 133 for rebootsEelco Dolstra2014-08-24
| | * | | | | | | | | | | | | | | systemd: Update to 216Eelco Dolstra2014-08-23
* | | | | | | | | | | | | | | | | some typosRene Donner2014-11-14
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #4983 from bosu/fw-stop-fixWilliam A. Kennington III2014-11-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | firewall: clear rpfilter on stopBoris Sukholitko2014-11-14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Re-enable ZFS in installer imagewmertens2014-11-13
* | | | | | | | | | | | | | | | Merge pull request #4807 from wizeman/u/zfs-improvementswmertens2014-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | nixos-generate-config: Configure networking.hostId by defaultRicardo M. Correia2014-11-12
| * | | | | | | | | | | | | | | | nixos: Add system-wide option to set the hostidRicardo M. Correia2014-11-12
| * | | | | | | | | | | | | | | | nixos/zfs: Improve the ZFS boot processRicardo M. Correia2014-11-12
| * | | | | | | | | | | | | | | | zfs: Enable systemdRicardo M. Correia2014-11-12
* | | | | | | | | | | | | | | | | Fix init= stage 1 testShea Levy2014-11-12
* | | | | | | | | | | | | | | | | Add local-fs.target to minidlna.Moritz Ulrich2014-11-12
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4950 from joachifm/dnscrypt-proxyMichael Raskin2014-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add dnscrypt-proxy serviceJoachim Fasting2014-11-11
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4929 from abbradar/prl-toolsMichael Raskin2014-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | nixos/parallels-guest: add optionsNikolay Amiantov2014-11-12
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #4573 from fpletz/feature/lxc-configurationMichael Raskin2014-11-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add support for global LXC config filesFranz Pletz2014-10-18
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Disable zfs in the ISO for nowEelco Dolstra2014-11-12
* | | | | | | | | | | | | | | | apache-httpd: add mod_access_compat for compatibility with old httpd-22 confi...Longrin Wischnewski2014-11-12
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | nixos: move bcache udev rule in a new bcache.nix moduleLuca Bruno2014-11-10
* | | | | | | | | | | | | | | nixos: Add boot.initrd.extraUdevRulesCommandsLuca Bruno2014-11-10
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |