summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* 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
| * | Refactor EC2 image generation script. Now uses same procedure for both hvm an...Rob Vermaas2014-10-27
| * | Add nodejs to the small channelEelco Dolstra2014-10-27
| * | Merge pull request #4506 from cstrahan/logstash-configlethalman2014-10-26
| |\ \
| | * | logstash service: make log verbosity configurable.Charles Strahan2014-10-13
| * | | Merge pull request #4213 from wkennington/master.zfsisoWilliam A. Kennington III2014-10-25
| |\ \ \
| | * | | nixos-iso: Add zfs / btrfs to supportedFilesystemsWilliam A. Kennington III2014-10-14
| * | | | Merge pull request #4640 from lethalman/installer-iconsAristid Breitkreuz2014-10-25
| |\ \ \ \
| | * | | | kde installer: Add gparted, nixos manual and konsole in the desktopLuca Bruno2014-10-23
* | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-24
|\| | | | |
| * | | | | gnome3: Add cantarell fonts. Closes #4633Luca Bruno2014-10-24
| * | | | | Merge pull request #4553 from ehmry/polipoDomen Kožar2014-10-23
| |\ \ \ \ \
| | * | | | | drop permission prestart from polipo service moduleEmery Hemingway2014-10-16
| * | | | | | Merge pull request #4631 from robberer/tmp1Peter Simons2014-10-23
| |\ \ \ \ \ \
| | * | | | | | passwordFile: update descriptionLongrin Wischnewski2014-10-23
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #4614 from geerds/kde4-plasma-nmThomas Tuegel2014-10-22
| |\ \ \ \ \ \
| | * | | | | | kde4: Use plasma-nm instead of knetworkmanagerJascha Geerds2014-10-22
* | | | | | | | Merge recent master into stagingVladimír Čunát2014-10-23
|\| | | | | | |
| * | | | | | | Merge pull request #4597 from ehmry/cjdnsAristid Breitkreuz2014-10-22
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | cjdns: add peer hostnames to extraHosts, option for external configEmery Hemingway2014-10-21
| | |/ / / / /
| * | | | | | grsecurity: Update documentation to mention correct kernelsRicardo M. Correia2014-10-22
| * | | | | | next release will be 14.11Domen Kožar2014-10-22
| * | | | | | Merge branch 'nixpart-1.0-preparations'.aszlig2014-10-22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | nixpart: Move all 0.4 dependencies into one dir.aszlig2014-10-22
| | * | | | | nixpart: Bring back requirements for version 0.4.aszlig2014-10-22
| | * | | | | nixos/tests/partition: Fix typo in F2FS tests.aszlig2014-10-22
| | * | | | | nixos: Add VM test for blivet.aszlig2014-10-22
| | * | | | | nixos: Add a filesystem module for JFS.aszlig2014-10-22
| | * | | | | blivet: Update to new upstream version 0.67.aszlig2014-10-22
| * | | | | | Removed the kde4_next nixos moduleGeorges Dubus2014-10-21
| |/ / / / /
| * | | | | nixos: prosody was clashing with seeks unix idsDomen Kožar2014-10-20
| * | | | | nixos/graphite: fix grahite api documentation urlJaka Hudoklin2014-10-20
| * | | | | nixos/graphite: update docs, add graphite pagerJaka Hudoklin2014-10-20
| * | | | | Let the kernel load firmware directlyEelco Dolstra2014-10-20
| * | | | | Add openjdk to the small channelEelco Dolstra2014-10-20