about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2018-04-17Revert "nixos/version: fix nixops pre 1.6 compatibility"Jan Malakhovski2-17/+2
2018-04-16Merge pull request #38982 from das-g/patch-2Joachim F1-1/+1
2018-04-16nixos/release.nix: Add SD images for ARMv6 + ARMv7Tuomas Tynkkynen1-2/+6
2018-04-16nixos/installer/channel: Add some files that the channel also hasTuomas Tynkkynen1-0/+2
2018-04-16Merge pull request #35896 from wucke13/masteradisbladis1-1/+20
2018-04-16nixos manual: add missing space after "copytoram"Raphael Das Gupta1-1/+1
2018-04-14nixos/pulseaudio: pulseaudio.enable should imply sound.enableJörg Thalheim1-0/+2
2018-04-14Merge pull request #38929 from Mic92/lxdJörg Thalheim3-28/+39
2018-04-14docker-tools: add a test for permissions issues with AUFS/overlayDaiderd Jordan3-3/+36
2018-04-14lxd: 2.16 -> 3.0.0Jörg Thalheim3-28/+39
2018-04-13nixos/transmission: fix AppArmor profile to include libkrb5Ricardo M. Correia1-0/+1
2018-04-13nixos: enable bash command completion by defaultBjørn Forsman2-2/+1
2018-04-13Fix kernel-copperhead testTim Steinbach1-2/+2
2018-04-13Merge pull request #38896 from abbradar/shadowsocksNikolay Amiantov2-0/+113
2018-04-13dnscache service: cleanup and add forwardOnlyNikolay Amiantov1-6/+23
2018-04-13dnscache service: fix bug with several assigned DNS serversNikolay Amiantov1-1/+1
2018-04-13shadowsocks service: initNikolay Amiantov2-0/+113
2018-04-13Merge pull request #38885 from lopsided98/grafana-unix-socketJörg Thalheim1-1/+1
2018-04-13Merge pull request #38820 from brainrape/nixos-prosody-add-user-groupRobert Schütz1-6/+20
2018-04-13nixos/prosody: fix pidfile pathMárton Boros1-2/+3
2018-04-13nixos/prosody: add user, group optionsMárton Boros1-4/+17
2018-04-12grafana: support socket protocolBen Wolsieffer1-1/+1
2018-04-12Merge pull request #38704 from roconnor-blockstream/trezoradisbladis1-1/+1
2018-04-12exfat-utils, fuse_exfat -> exfatvolth1-1/+1
2018-04-11nixos/postgresql: remove ancient hack for postgres 8.4Austin Seipp1-4/+1
2018-04-11Merge pull request #38773 from bandresen/zfsAutoSnapshotYegor Timoshenko1-1/+1
2018-04-11zfs.autoSnapshot: make `frequent` run every 15 minsBenjamin Andresen1-1/+1
2018-04-11trezord: 1.2.1 -> 2.0.12Russell O'Connor1-1/+1
2018-04-11Merge staging into masterFrederik Rietdijk9-102/+97
2018-04-10safeeyes: restart only on failureBjornMelgaard1-1/+3
2018-04-10safeeyes: add moduleBjornMelgaard2-0/+49
2018-04-10Merge master into stagingFrederik Rietdijk1-4/+10
2018-04-10Merge pull request #38643 from brainrape/prosody-add-dataDirJörg Thalheim1-4/+10
2018-04-10Merge branch 'master' into stagingRobert Schütz4-8/+45
2018-04-10nixos/make-ext4-fs: Use closureInfoTuomas Tynkkynen1-8/+7
2018-04-09Merge pull request #33794 from yrashk/onlykeyMatthew Justin Bauer3-0/+38
2018-04-09Merge master into stagingFrederik Rietdijk12-11/+141
2018-04-09nixos/prosody: add dataDir optionMárton Boros1-4/+10
2018-04-09nixos/tests.chromium: actually notice the tab crashMichael Raskin1-2/+22
2018-04-09Merge pull request #38362 from orbekk/acme-pathJörg Thalheim1-4/+5
2018-04-09Merge pull request #38513 from Ma27/clementine-license-fixesJörg Thalheim1-0/+3
2018-04-09lxc: enable pam_cgfs and fix moduleJörg Thalheim1-1/+1
2018-04-09Merge pull request #38629 from ivanbrennan/less-configFileJörg Thalheim1-2/+15
2018-04-08Merge pull request #38533 from nyanloutre/duplicati-packageMatthew Justin Bauer3-0/+43
2018-04-08nixos/less: add configFile optionivanbrennan1-2/+15
2018-04-08Merge pull request #38094 from volth/patch-120Matthew Justin Bauer1-2/+2
2018-04-08Merge pull request #38547 from Ma27/iftop-moduleJörg Thalheim4-0/+50
2018-04-08Increase max group name length to 32 charactersaszlig1-1/+1
2018-04-08Merge master into stagingFrederik Rietdijk9-22/+64
2018-04-08google-compute-image: provide correct MTUWout Mertens1-0/+3