about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2021-01-18Merge master into staging-nextgithub-actions[bot]2-0/+127
2021-01-17nixos/nomad: default enableDocker to trueBernardo Meurer1-1/+1
2021-01-17nixos/nomad: initBernardo Meurer2-0/+127
2021-01-17Merge remote-tracking branch 'upstream/master' into HEADJörg Thalheim2-6/+7
2021-01-17nixos/promtheus-nextcloud-exporter: update module and testWilliButz2-6/+7
2021-01-17Merge master into staging-nextgithub-actions[bot]1-0/+2
2021-01-17Merge pull request #109607 from alesguzik/improve_snapper_examplemarkuskowa1-0/+2
2021-01-17nixos/snapper: improve config exampleAles Huzik1-0/+2
2021-01-16Merge master into staging-nextgithub-actions[bot]2-1/+3
2021-01-16Merge pull request #109494 from ipetkov/nixos-zpool-trim-persistent-timerJörg Thalheim1-0/+2
2021-01-16Merge pull request #109099 from jpotier/fix-deprecation-warning-azure-agentAaron Andersen1-1/+1
2021-01-16Merge master into staging-nextgithub-actions[bot]2-517/+1
2021-01-15nixos/zfs: make zpool-trim timer persistentIvan Petkov1-0/+2
2021-01-15move nixos-rebuild into pkgsDomen Kožar2-517/+1
2021-01-15Merge branch 'master' into staging-nextJan Tojnar7-29/+58
2021-01-15Merge pull request #108932 from Atemu/iso-image-compress-filterKevin Cox1-1/+6
2021-01-15iso-image: enable XZ compress filterAtemu1-1/+6
2021-01-15nixos/docker: change misleading error messageMilan Pässler1-1/+1
2021-01-15Revert "nixos/tests/docker: wait for docker service"Mark Vainomaa2-2/+2
2021-01-15docker: fix systemd socket activationMark Vainomaa1-1/+1
2021-01-15nixos/gitea: make more secrets persistent (#108676)clerie1-9/+41
2021-01-15Merge pull request #108862 from cpcloud/refactor-nvidia-containersJörg Thalheim2-13/+2
2021-01-15Merge pull request #109096 from ju1m/torJörg Thalheim1-2/+5
2021-01-15Merge master into staging-nextgithub-actions[bot]3-3/+3
2021-01-15nixos/tests/docker: wait for docker service (#109418)Milan2-2/+2
2021-01-15redis: make masterAuth option optional (#109417)Milan1-1/+1
2021-01-15Merge master into staging-nextgithub-actions[bot]12-18/+56
2021-01-15Merge pull request #108860 from endocrimes/dani/fix-tmpAndreas Rammhold1-0/+1
2021-01-14Merge pull request #108940 from Atemu/zfs-test-with-stable-linuxPackagesKevin Cox1-1/+1
2021-01-14Merge pull request #91813 from Mic92/types1Kevin Cox5-7/+44
2021-01-14gitAndTools: move everything to the top levelAlyssa Ross5-10/+10
2021-01-14Merge master into staging-nextgithub-actions[bot]3-2/+4
2021-01-14Merge pull request #109066 from michael-p-m-white/reenable-working-clfswmMichael Raskin3-2/+4
2021-01-14Merge master into staging-nextgithub-actions[bot]3-58/+40
2021-01-14nixos/postfix: deprecate services.postfix.useDaneAlyssa Ross1-12/+6
2021-01-14nixos/postfix: allow custom smtp_tls_security_levelAlyssa Ross1-1/+1
2021-01-14Merge pull request #109114 from illustris/searxMichele Guerini Rocco2-46/+34
2021-01-14nixos/searx: remove settings.yml merging scriptrnhmjoj2-46/+31
2021-01-14nixos/searx: fix for 0.18.0 updaternhmjoj1-0/+3
2021-01-14Merge master into staging-nextgithub-actions[bot]1-1/+1
2021-01-14Merge pull request #109303 from ilian/fix/openldap-maintainers-typoSandro1-1/+1
2021-01-14Merge branch 'master' into staging-nextJan Tojnar6-14/+27
2021-01-14Merge pull request #108966 from pstn/murmurPswitchSilvan Mosberger1-1/+8
2021-01-13nixos/matrix-synapse: enable HTTPS in example (#109230)sephalon1-0/+3
2021-01-13openldap: fix typo in maintainersilian1-1/+1
2021-01-13treewide: emacsPackages -> emacs.pkgs & emacsWithPackages -> emacs.pkgs.withP...adisbladis2-6/+6
2021-01-13nixos ISO image: revert another part of 8ca33835baVladimír Čunát3-28/+14
2021-01-13nixos ISO image: revert a part of 8ca33835baVladimír Čunát1-7/+3
2021-01-13nixos: fixup build of aarch64 minimal ISO (fixes #109252)Vladimír Čunát4-18/+41
2021-01-13docker: 19.03.4 -> 20.10.2 (#108960)Mark Vainomaa1-4/+2