about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2018-11-10Merge pull request #50113 from ryantm/monitJörg Thalheim1-18/+15
2018-11-10Merge pull request #50115 from Ekleog/nextcloud-pgsql-unixJörg Thalheim1-1/+6
2018-11-10Merge pull request #38514 from disassembler/grafana-reporterSilvan Mosberger2-0/+67
2018-11-10Merge pull request #48687 from danielrutz/port-typeSilvan Mosberger2-2/+13
2018-11-10nextcloud module: document process for using with pgsql unix authLéo Gaspard1-1/+6
2018-11-10Merge pull request #37365 from proteansec/pkgs/baculaSilvan Mosberger1-6/+18
2018-11-09nixos/nix: ignore nix.checkConfig when cross-compiling (#48225)volth1-5/+9
2018-11-09nixos/monit: change type of 'config' option to linesRyan Mulligan1-18/+15
2018-11-09Merge pull request #40043 from kierdavis/ckb-update-and-cleanupSamuel Dionne-Riel4-9/+20
2018-11-10Merge pull request #49671 from hyperfekt/bcachefs_cryptrootVladyslav M2-15/+51
2018-11-09Merge pull request #49876 from etu/add-dmrconfig-module-udev-rulesadisbladis2-0/+39
2018-11-09Merge pull request #49809 from griff/rspamd-workersFranz Pletz2-19/+142
2018-11-09nixos/rspamd: Add options for postfix integrationBrian Olsen2-1/+87
2018-11-08Merge pull request #49814 from aanderse/giteaRenaud3-2/+85
2018-11-08nixos/gitea: add a nixos test to ensure the initial database migration succee...Aaron Andersen2-0/+75
2018-11-08nixos/gitea: add mysql socket authentication as an optionAaron Andersen1-1/+8
2018-11-08nixos/gitea: fix systemd after target when mysql is the database of choiceAaron Andersen1-1/+2
2018-11-08nixos/alerta: create new module + add kapacitor integrationSander van der Burg4-0/+157
2018-11-08nixos/tests/hydra: set the project visibleAntoine Eiche1-1/+2
2018-11-08nixos/dmrconfig: Add module to enable udev rulesElis Hirwing2-0/+39
2018-11-08Merge pull request #49864 from oxij/pkgs/tiny-thingsMichael Raskin1-5/+8
2018-11-08nixos/release.nix: generalize `modules` copy-paste into `makeModules`Jan Malakhovski1-5/+8
2018-11-07nixos/manual: move syncthing notice in the right positionrnhmjoj1-10/+10
2018-11-07Merge pull request #44439 from Ekleog/meta-testsTimo Kaufmann2-1/+5
2018-11-06nixos/jupyter: wait for network.targetsveitser1-0/+1
2018-11-06Merge pull request #49792 from griff/rspamd-multifile-enableFranz Pletz2-12/+34
2018-11-06nixos: packagekit can no longer use "nix" default back-endPeter Simons1-3/+0
2018-11-06Merge pull request #49354 from aanderse/fstab-escapingJörg Thalheim1-3/+5
2018-11-06Merge pull request #49516 from johanot/kubedns-to-corednsSarah Brofeldt3-198/+205
2018-11-06nixos/bcachefs: enable encrypted roothyperfekt1-8/+52
2018-11-06ckb-next: move option renames to nixos/modules/rename.nix for consistencyKier Davis2-5/+4
2018-11-06Merge branch 'master' into ckb-update-and-cleanupKier Davis99-544/+1700
2018-11-06nixos/rspamd: Put extraConfig in included filesBrian Olsen2-4/+21
2018-11-06nixos/rspamd: Add defaults for rspamd_proxy workerBrian Olsen1-14/+16
2018-11-06nixos/rspamd: Support multiple workersBrian Olsen2-1/+19
2018-11-05nixos/rspamd: Fix enable for locals and overridesBrian Olsen2-12/+34
2018-11-05Merge pull request #49778 from gebner/rngd-versionGabriel Ebner1-1/+1
2018-11-05nixos/rngd: do not pass --version flagGabriel Ebner1-1/+1
2018-11-05Revert "NixOS tests: Wait for shell for 10x longer (50m)"Sarah Brofeldt1-2/+1
2018-11-04Merge pull request #47679 from NixOS/docs-make-channelMatthew Bauer1-0/+4
2018-11-04Remove incorrect sentence from make-channel commentRobert Hensing1-1/+1
2018-11-04Merge pull request #49670 from matthewbauer/pkgs-i686-removeMatthew Bauer7-15/+14
2018-11-04Merge pull request #44303 from pvgoran/tomcat-clean-basedirMichael Raskin1-1/+26
2018-11-04nixos/prometheus: check configuration before starting serviceAndreas Rammhold1-5/+13
2018-11-04nixos/prometheus: add `package` optionAndreas Rammhold1-1/+10
2018-11-04Merge pull request #49746 from NixOS/fix-nixos-bash-completion-commentRobert Hensing1-1/+1
2018-11-04Merge pull request #49283 from aanderse/solrAndreas Rammhold5-109/+129
2018-11-04nixos: programs.bash: Fix comment about completionRobert Hensing1-1/+1
2018-11-04Merge pull request #49687 from gnidorah/swayMichael Weiss1-4/+29
2018-11-04gitlab module: fix config handlingRobin Gloster1-3/+4