about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2015-11-18Merge pull request #11056 from offlinehacker/nixos/systemd/onfailureJaka Hudoklin2-0/+11
2015-11-18nixos: remove debug code accidentally checked in with 833a5971568f8b5ea189126...Peter Simons1-1/+0
2015-11-18nixos: configure bash prompt in Emacs' shell-mode, even if TERM=dumbPeter Simons1-2/+3
2015-11-18devmon: Non-root user, set PATH, require udisks2Ollie Charles1-3/+5
2015-11-18ibus: fix dconf dependencyEric Sagnes1-1/+1
2015-11-17Merge pull request #11048 from offlinehacker/pkgs/influxdb/update_0.9.4Jaka Hudoklin1-149/+90
2015-11-17Merge pull request #11051 from offlinehacker/pkgs/bosun/update_0.5.0Jaka Hudoklin1-4/+24
2015-11-17Merge pull request #11061 from offlinehacker/nixos/heapster/addJaka Hudoklin3-0/+59
2015-11-17Merge pull request #11058 from offlinehacker/nixos/kubernetes1/gitJaka Hudoklin1-0/+1
2015-11-17Merge pull request #11055 from offlinehacker/pkgs/grafana/update_2.5.0Jaka Hudoklin1-146/+47
2015-11-16heapster module: initJaka Hudoklin3-0/+59
2015-11-16kubernetes module: kubelet add git and ssh to pathJaka Hudoklin1-0/+1
2015-11-16systemd module: Add OnFailure to systemd common unit optionsJaka Hudoklin2-0/+11
2015-11-16grafana module: updateJaka Hudoklin1-146/+47
2015-11-16bosun module: update moduleJaka Hudoklin1-4/+24
2015-11-16influxdb: 0.8.3 -> 0.9.4, fix moduleJaka Hudoklin1-149/+90
2015-11-16Merge pull request #10610 from joachifm/scsi-link-pmDomen Kožar1-24/+10
2015-11-16Merge pull request #9733 from basvandijk/wordpress-fix-extraConfigDomen Kožar1-1/+1
2015-11-16Merge pull request #11005 from robbinch/fix-nix-serveRickard Nilsson1-1/+1
2015-11-15Merge pull request #11022 from dasjoe/manualPascal Wittmann1-2/+2
2015-11-14Merge remote-tracking branch 'upstream/master' into master.upstreamWilliam A. Kennington III1-1/+0
2015-11-14Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""William A. Kennington III3-5/+22
2015-11-14nixos manual: point to NixOps' homepage, not GithubHajo Möller1-2/+2
2015-11-14lighttpd: fix mod_rewrite appearing twiceGuillaume Maudoux1-1/+0
2015-11-13Merge commit 'cb21b77' into master.upstreamWilliam A. Kennington III5-25/+87
2015-11-13fix: ihaskell's and xmonad's dependence on haskell-ngLengyel Balázs2-6/+6
2015-11-13Merge pull request #10993 from oxij/nixos-actkbd-tinyfixArseniy Seroka1-0/+3
2015-11-13Change argument --port to --listen in nix-serve.nixRobbin C1-1/+1
2015-11-12Update comment for gdm service.James Cook1-1/+3
2015-11-12nixos: add actkbd package to environment in actkbd moduleJan Malakhovski1-0/+3
2015-11-11nixos/autofs: revive and update to systemdNikolay Amiantov2-39/+8
2015-11-11services.tlsdated: use google.com as default host Pascal Wittmann1-1/+1
2015-11-10redshift: document lat/long and temp boundsChris Martin1-4/+8
2015-11-10Merge pull request #10460 from abbradar/remote-askpassNikolay Amiantov5-9/+183
2015-11-10virtualbox service: hide vboxnet0 from NetworkManager, fixes #10862Tomasz Kontusz1-0/+3
2015-11-10networkmanager service: add unmanaged optionTomasz Kontusz1-3/+14
2015-11-10quassel service: Support multiple listen addresses, fixes #10924Alexei Robyn1-5/+5
2015-11-09tlp: add x86_energy_perf_policy, refactorNikolay Amiantov1-2/+9
2015-11-09i18n: add color scheme option (close #9626)rnhmjoj2-1/+20
2015-11-08Add the CLFSWM window managerRobert Glossop2-0/+32
2015-11-08Merge pull request #10620 from gebner/postfix-3.0.3Peter Simons1-19/+20
2015-11-07Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III4-4/+14
2015-11-07nixos/bosun: Make the check frequency configurableRickard Nilsson1-1/+9
2015-11-06Merge pull request #9463 from khumba/nm-connection-sharingDomen Kožar1-1/+2
2015-11-06Merge pull request #9805 from Mathnerd314/quassel-fixDomen Kožar1-1/+2
2015-11-06Merge pull request #10746 from jgertm/fix-wol-docDomen Kožar1-1/+1
2015-11-05Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III3-54/+96
2015-11-05nixos/tlp: workaround early build triggerNikolay Amiantov1-1/+10
2015-11-04Merge pull request #10731 from ttuegel/plasma-5.4Thomas Tuegel2-53/+86
2015-11-04Merge remote-tracking branch 'origin/systemd-219' into stagingEelco Dolstra1-4/+2