about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Collapse)AuthorFilesLines
2021-03-20Merge master into staging-nextgithub-actions[bot]3-18/+51
2021-03-20Merge pull request #108952 from Mic92/systemd-builderJörg Thalheim2-18/+44
nixos/systemd-boot: add typechecking
2021-03-20nixos/gitlab: add option for tls wrapper-mode smtp (#116801)Milan1-0/+7
2021-03-19Merge staging-next into staginggithub-actions[bot]1-5/+4
2021-03-19Merge master into staging-nextFrederik Rietdijk1-5/+4
2021-03-19Merge pull request #112822 from deviant/localtime-user-allocationedef1-5/+4
nixos/localtime: make localtimed a system user
2021-03-19Merge staging-next into staginggithub-actions[bot]4-53/+21
2021-03-19Merge master into staging-nextgithub-actions[bot]4-53/+21
2021-03-19Merge pull request #114016 from oxalica/fix/partition-managerSandro2-0/+20
2021-03-19Revert "nixos/systemd: Handle template overrides"Alexander Foremny2-53/+1
This reverts commit e3b90b6ccc4cf4147fd01df1ed8779b1c85744bd. This commit broke container tests and thus blocked channels from advancing.
2021-03-19Merge staging-next into staginggithub-actions[bot]11-4/+695
2021-03-19Merge master into staging-nextgithub-actions[bot]4-0/+227
2021-03-19Merge pull request #116282 from nh2/programs-turbovncNiklas Hambüchen4-0/+227
turbovnc: Add programs.turbovnc, add test for headless software OpenGL
2021-03-18Merge branch 'master' into staging-nextJan Tojnar1-1/+10
2021-03-18Merge pull request #115839 from markuskowa/fix-slurmmarkuskowa1-1/+10
nixos/slurm: expose to path config files
2021-03-18Merge branch 'master' into staging-nextJan Tojnar7-3/+458
2021-03-18nixos/update-users-groups: read access to /etc/shadow for group shadowJaakko Luttinen1-1/+1
2021-03-17Merge pull request #109711 from ymarkus/bookstackAaron Andersen2-0/+366
bookstack: init at 0.31.7, nixos/bookstack: init
2021-03-17nixos/sway: further parity between extraPackages default and defaultTextkat1-1/+1
Co-authored-by: Robert Schütz <rschuetz17@gmail.com>
2021-03-17nixos/sway: fixed defaultTextkat witch1-1/+1
2021-03-17prometheus-postgres-exporter: add environment file (#116373)Raphael Megzari1-0/+37
* prometheus-postgres-exporter: add environment file * Update nixos/modules/services/monitoring/prometheus/exporters/postgres.nix Co-authored-by: WilliButz <WilliButz@users.noreply.github.com>
2021-03-16Merge pull request #115549 from adrianparvino/new-nixos-unstableFlorian Klink2-1/+53
systemd: Handle template overrides
2021-03-16Merge staging-next into staginggithub-actions[bot]1-1/+1
2021-03-16Merge master into staging-nextgithub-actions[bot]1-1/+1
2021-03-16Merge pull request #115655 from helsinki-systems/upd/nginxajs1241-1/+1
nginxMainline: 1.19.7 -> 1.19.8
2021-03-16Merge staging-next into staginggithub-actions[bot]2-3/+3
2021-03-16Merge master into staging-nextgithub-actions[bot]2-3/+3
2021-03-15Merge pull request #116387 from lf-/doc-fixSarah Brofeldt1-1/+1
manual/installation: s/boot.loader.systemd/boot.loader.systemd-boot
2021-03-15nixos/kubernetes: import all platforms for seeded imagesjali-clarke1-2/+2
This fixes a class of errors seen on aarch64 during coredns import where content was seen to be missing ("digest xxx not found") or "failed to get reader from content store" depending on which coredns version was being imported.
2021-03-15manual/installation: s/boot.loader.systemd/boot.loader.systemd-bootJade1-1/+1
The link had the wrong title.
2021-03-15Merge staging-next into staginggithub-actions[bot]1-0/+10
2021-03-15Merge master into staging-nextgithub-actions[bot]1-0/+10
2021-03-14Merge pull request #116084 from jonringer/bump-factorioSarah Brofeldt1-0/+10
factorio: 1.1.26 -> 1.1.27
2021-03-14Merge staging-next into staginggithub-actions[bot]3-4/+4
2021-03-14Merge master into staging-nextgithub-actions[bot]1-1/+1
2021-03-14Merge pull request #116303 from samuelgrf/printing-related-refactorsSandro1-1/+1
2021-03-14Merge branch 'master' into staging-nextMartin Weinelt2-3/+3
2021-03-14Merge pull request #113881 from jtojnar/stdenv.mdJan Tojnar2-3/+3
doc: Port stdenv to Markdown
2021-03-14nixos/printing: simplify filterGutenprint functionSamuel Gräfenstein1-1/+1
2021-03-14Merge staging-next into staginggithub-actions[bot]1-1/+1
2021-03-14Merge master into staging-nextgithub-actions[bot]1-1/+1
2021-03-14nixos/tests/spike: Fix assertionLancelot SIX1-1/+1
2021-03-14turbovnc: Add programs.turbovnc, add test for headless software OpenGLNiklas Hambüchen4-0/+227
2021-03-14doc: Port stdenv/multiple-output to MarkdownJan Tojnar1-1/+1
2021-03-14doc: Port stdenv/meta to MarkdownJan Tojnar1-2/+2
2021-03-14Merge branch 'staging-next' into stagingJan Tojnar5-6/+130
2021-03-14nixos/doc: Fix release notes syntaxJan Tojnar1-3/+3
2021-03-13Merge branch 'master' into staging-nextJan Tojnar5-6/+130
Reverted https://github.com/NixOS/nixpkgs/pull/115228 for kodi to avoid conflict. It does not look like unzip would be used but not investigating now to speed up merge conflict resolution.
2021-03-13Merge pull request #106599 from doronbehar/pkg/gnuradio/pkgsDoron Behar1-1/+11
2021-03-13Merge pull request #115871 from aanderse/kodi-packagesAaron Andersen1-0/+38
kodi: plugins cleanup