summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2021-04-25Merge pull request #119952 from attila-lendvai/extraLayoutsMichele Guerini Rocco1-13/+30
2021-04-25Merge pull request #119443 from ambroisie/add-podgrabLuke Granger-Brown4-0/+86
2021-04-25Merge master into staging-nextFrederik Rietdijk7-42/+85
2021-04-25Merge pull request #114240 from sorki/containers/nestedLuke Granger-Brown3-8/+34
2021-04-25Merge pull request #114637 from KaiHa/pr/fix-systemd-boot-builderLuke Granger-Brown1-3/+6
2021-04-25Merge pull request #107604 from pkern/eximLuke Granger-Brown1-1/+8
2021-04-25Merge pull request #103902 from pkern/spamassassinLuke Granger-Brown1-29/+36
2021-04-25Merge pull request #120508 from Mic92/nixos-installJörg Thalheim1-1/+1
2021-04-25Merge master into staging-nextgithub-actions[bot]3-8/+21
2021-04-25Merge branch 'master' into staging-nextJan Tojnar6-3/+45
2021-04-25nixos/tests/babeld: drop forwarding sysctlsMartin Weinelt1-6/+0
2021-04-25nixos/babeld: run as DynamicUserMartin Weinelt2-2/+21
2021-04-24Merge pull request #119803 from SuperSandro2000/SuperSandro2000-patch-1Lassulus1-0/+1
2021-04-24Merge pull request #119498 from mweinelt/tests-birdMaximilian Bosch1-1/+5
2021-04-24Merge pull request #120537 from symphorien/nagios-restartGuillaume Girol1-1/+1
2021-04-24Merge pull request #119725 from helsinki-systems/feat/flexoptix-appLassulus2-0/+26
2021-04-24nixos/mastodon/sandbox: add @privileged and @raw-io to SystemCallFilterIzorkin1-1/+12
2021-04-24nixos/nagios: use the correct option to restart on config changeSymphorien Gibol1-1/+1
2021-04-24nixos-install: fix flake commandJörg Thalheim1-1/+1
2021-04-24nixos/doc/manual: refine extraLayouts, add warnings an test commandsAttila Lendvai1-13/+30
2021-04-24Merge master into staging-nextgithub-actions[bot]10-23/+17
2021-04-24Revert "treewide: use auto diskSize for make-disk-image"Luke Granger-Brown9-22/+16
2021-04-24Revert "nixos/amazon-image: (temporarily) use fixed disk size again"Luke Granger-Brown1-2/+1
2021-04-24Merge pull request #120481 from lukegb/temp-ec2-fixed-diskLuke Granger-Brown1-1/+2
2021-04-24Merge pull request #119706 from nyanotech/masterSandro1-1/+1
2021-04-24nixos/amazon-image: (temporarily) use fixed disk size againLuke Granger-Brown1-1/+2
2021-04-24Merge master into staging-nextgithub-actions[bot]6-67/+111
2021-04-23Merge pull request #119914 from evils/vnstatAaron Andersen1-13/+15
2021-04-24nixos/vnstat: homedir -> statedirEvils1-13/+15
2021-04-23nixos/tests/prometheus-exporters/bird: set router idMartin Weinelt1-0/+2
2021-04-23Merge pull request #120125 from BBBSnowball/pr-add-config-nextcloud-imagick-r...Maximilian Bosch2-8/+9
2021-04-23Merge remote-tracking branch 'nixpkgs/master' into staging-nextAlyssa Ross1-26/+4
2021-04-23Merge pull request #120324 from pennae/restart-sshguardAaron Andersen1-14/+18
2021-04-23Merge pull request #120349 from lukegb/debug-release-2009Luke Granger-Brown2-32/+69
2021-04-23nixos/test-driver: use a variety of different Tesseract settings for OCRLuke Granger-Brown2-32/+69
2021-04-23Merge pull request #120254 from Luflosi/ipfs-simplify-systemd-unitJörg Thalheim1-26/+4
2021-04-23nixos/sshguard: restart sshguard when services/backend changespennae1-14/+18
2021-04-22nixos/ipfs: remove separate ipfs-init systemd unitLuflosi1-26/+4
2021-04-22Merge master into staging-nextgithub-actions[bot]15-307/+37
2021-04-22Merge pull request #120195 from Mic92/quaggaLassulus5-283/+1
2021-04-22treewide: use auto diskSize for make-disk-imagelassulus9-16/+22
2021-04-22nixos/users-groups: check format of passwd entriesAlyssa Ross1-8/+14
2021-04-22Merge master into staging-nextgithub-actions[bot]3-3/+3
2021-04-22quagga: removeJörg Thalheim5-283/+1
2021-04-22maintainers: remove tavycMichael Weiss2-2/+2
2021-04-22Merge pull request #120023 from Mic92/nanoJörg Thalheim1-1/+1
2021-04-22Merge master into staging-nextgithub-actions[bot]1-0/+13
2021-04-22Merge pull request #119379 from Philipp-M/oci-containers-env-fileSandro1-0/+13
2021-04-22nixos/nextcloud: Rename services.nextcloud.nginx.disableImagemagick to servic...Benjamin Koch2-8/+9
2021-04-22Merge master into staging-nextgithub-actions[bot]1-1/+1