summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-10-07
|\
| * nixos/lighttpd: add services.lighttpd.enableModules optionBjørn Forsman2014-10-05
| * FONTCONFIG_FILE: remove setters to /etc/fonts/fonts.confVladimír Čunát2014-10-05
| * network-interfaces: Bonding fixesWilliam A. Kennington III2014-10-04
| * network-interface: Add extra bond optionsWilliam A. Kennington III2014-10-04
| * Replace hasAttr/getAttr calls with the ? and . operatorsEelco Dolstra2014-10-05
| * pulseaudio: Add support for 32bit alsa apps on 64bit systems.Nathaniel Baxter2014-10-04
| * alsa: Add multilib plugin support via "libs" entry in asound config.Nathaniel Baxter2014-10-04
| * Merge pull request #4294 from daogames/tb/psql-port-fixAustin Seipp2014-10-01
| |\
| | * postgresql: use configured port when invoking psqlTino Breddin2014-09-27
| * | More pkgs.lib -> lib fixesShea Levy2014-09-29
| * | tests/kde4.nix: Don't build kdeeduEelco Dolstra2014-09-29
| * | nixos: munin/jenkins: specify timeout correctlyDomen Kožar2014-09-28
| * | nixos: increase timeout for jenkins/munin systemd servicesDomen Kožar2014-09-27
| * | merge #4265: add KDE 4.14.1Vladimír Čunát2014-09-27
| |\ \ | | |/ | |/|
| | * kde: Allow kde_next as a desktop environmentambrop7@gmail.com2014-09-24
| * | Merge pull request #4280 from wkennington/master.consulJaka Hudoklin2014-09-27
| |\ \
| | * | nixos/consul: Add moduleWilliam A. Kennington III2014-09-26
| * | | mailpile: add moduleMatej Cotman2014-09-26
| * | | nixos/ids: Add consulWilliam A. Kennington III2014-09-26
| * | | iproute: Fix regressions introduced in 3.16.0William A. Kennington III2014-09-26
| * | | Add all default NixOS packages to the channelEelco Dolstra2014-09-25
| * | | Installer test: Use the minimal ISOEelco Dolstra2014-09-25
| * | | test-driver: Use netpbm instead of imagemagickEelco Dolstra2014-09-25
| | |/ | |/|
| * | nixos: mark services.samba.defaultShare as obsoleteBjørn Forsman2014-09-24
| * | Add cryptodisk support for GrubFranz Pletz2014-09-24
| * | nixos/samba: add services.samba.configText optionBjørn Forsman2014-09-24
| * | nixos/samba: remove services.samba.defaultShare optionBjørn Forsman2014-09-24
| * | Merge pull request #4244 from abbradar/resumeEelco Dolstra2014-09-24
| |\ \
| | * | stage-1: Use udevadm instead of blkidNikolay Amiantov2014-09-24
| | * | stage-1: autodetect resume swap partitionsNikolay Amiantov2014-09-24
| * | | include thermald service in module listEmil Rangden2014-09-23
| * | | cjdns: update from 20140919 20140922Emery Hemingway2014-09-23
| * | | Fix #4236William A. Kennington III2014-09-23
| | |/ | |/|
| * | nixos/install-grub: Don't run GrubFs(/nix/store) if copyKernels is trueRickard Nilsson2014-09-23
| * | Merge pull request #4211 from ehmry/cpuminer-cryptonightMateusz Kowalczyk2014-09-22
| |\ \
| | * | cpuminer-cryptonight: new service moduleEmery Hemingway2014-09-22
| * | | nixos: Add also group.members to groupRickard Nilsson2014-09-22
| * | | scrubDrv: Don't scrub the system and meta attributesEelco Dolstra2014-09-22
| * | | Merge branch 'dev/ati-drivers' of https://github.com/nathanielbaxter/nixpkgsMateusz Kowalczyk2014-09-22
| |\ \ \
| | * | | ati_unfree: Update nixos-manual for AMD driver supportNathaniel Baxter2014-09-07
| | * | | ati_unfree: Towards using ati unfree 32bit binary libsNathaniel Baxter2014-09-07
| | * | | ati_unfree: Create a nixos module for the ati_unfree x11 driver andNathaniel Baxter2014-09-07
| * | | | Ratpoison: updated for 1.4.8AndersonTorres2014-09-21
| * | | | Try fixing #4084Mateusz Kowalczyk2014-09-21
| * | | | mpd service: add network.{host,port} optionsDmitry Malikov2014-09-21
| * | | | extended gitolite service to take custom hooksRonny Esterluss2014-09-21
| * | | | AfterStep (version 2.2.12): New PackageAndersonTorres2014-09-21
| * | | | Windowmaker: adding system service file, and a long descriptionAndersonTorres2014-09-20
| | |/ / | |/| |
| * | | Merge pull request #4168 from lostdj/ltp/master/btsyncfixDomen Kožar2014-09-20
| |\ \ \ | | |_|/ | |/| |