summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into staging-nextgithub-actions[bot]2021-07-19
|\
| * Merge pull request #130633 from zimbatm/k3s-configPathJörg Thalheim2021-07-19
| |\
| | * nixos/k3s: add configPath optionzimbatm2021-07-19
| * | Merge pull request #130583 from jvanbruegge/isabelle2021Ben Siraphob2021-07-19
| |\ \ | | |/ | |/|
| | * isabelle: 2020 -> 2021Jan van Brügge2021-07-18
* | | Merge master into staging-nextgithub-actions[bot]2021-07-19
|\| |
| * | Merge pull request #130528 from etu/init-hockeypuckElis Hirwing2021-07-19
| |\ \ | | |/ | |/|
| | * nixos/tests: Init hockeypuck testsElis Hirwing2021-07-19
| | * nixos/hockeypuck: Add service for hockeypuckElis Hirwing2021-07-19
* | | Merge master into staging-nextgithub-actions[bot]2021-07-19
|\| |
| * | treewide: convert phases that contain ":" to dont* = true (#130500)Sandro2021-07-18
| * | nixos/doc: update EOL of 21.11Maxine Aubrey2021-07-18
| |/
* | Merge master into staging-nextgithub-actions[bot]2021-07-18
|\|
| * nixos/telegraf: improve documentationJörg Thalheim2021-07-18
| * nixos/telegraf: don't run as nogroupJörg Thalheim2021-07-18
| * Merge pull request #106721 from Mic92/nix-serveJörg Thalheim2021-07-18
| |\
| | * nixos/nix-serve: don't run as nogroupJörg Thalheim2021-07-18
* | | Merge master into staging-nextgithub-actions[bot]2021-07-18
|\| |
| * | Merge pull request #129980 from mweinelt/nixos/keaMartin Weinelt2021-07-18
| |\ \
| | * | nixos/doc: add release note entry for kea moduleMartin Weinelt2021-07-14
| | * | nixos/tests/kea: initMartin Weinelt2021-07-14
| | * | nixos/tests/prometheus-exporters/kea: migrate to kea nixos moduleMartin Weinelt2021-07-14
| | * | nixos/prometheus: allow overriding default export userMartin Weinelt2021-07-14
| | * | nixos/kea: initMartin Weinelt2021-07-14
* | | | Merge master into staging-nextgithub-actions[bot]2021-07-17
|\| | |
| * | | Merge pull request #130427 from lf-/fix-manual-linkJörg Thalheim2021-07-17
| |\ \ \ | | |_|/ | |/| |
| | * | nixos/manual: Fix link to contributing guideJade2021-07-16
* | | | Merge master into staging-nextgithub-actions[bot]2021-07-17
|\| | |
| * | | nixos/bind: add directory config option (#129188)Leo2021-07-17
| |/ /
* | | Merge master into staging-nextgithub-actions[bot]2021-07-17
|\| |
| * | Merge master into haskell-updatesgithub-actions[bot]2021-07-17
| |\ \
| * \ \ Merge master into haskell-updatesgithub-actions[bot]2021-07-16
| |\ \ \
| * | | | nixosTests.agda: Adapt to --guardedness requirementsManuel Bärenz2021-07-15
* | | | | Merge master into staging-nextgithub-actions[bot]2021-07-16
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | nixos/wordpress: nginx supportJean-Philippe Braun2021-07-16
| | |/ / | |/| |
* | | | Merge master into staging-nextgithub-actions[bot]2021-07-15
|\| | |
| * | | Merge pull request #130257 from primeos/nixos-xwaylandRobert Hensing2021-07-15
| |\ \ \
| | * | | nixos/xwayland: Correctly set the default packageMichael Weiss2021-07-15
| | |/ /
| * | | Merge pull request #129464 from talyz/discourse-pluginsKim Lindberger2021-07-15
| |\ \ \
| | * | | nixos/discourse: Update plugin documentationtalyz2021-07-14
| * | | | Merge pull request #130113 from helsinki-systems/upd/icingaweb2ajs1242021-07-15
| |\ \ \ \
| | * | | | nixos/icingaweb2: Add ipl and thirdparty librariesJanne Heß2021-07-13
| | | |_|/ | | |/| |
| * | | | Merge pull request #125205 from Mic92/token-fileJörg Thalheim2021-07-15
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | k3s: add tokenFile optionJörg Thalheim2021-06-01
| | * | | nixos/k3s: add to environment.systemPackages for adminstrationJörg Thalheim2021-06-01
* | | | | Merge master into staging-nextgithub-actions[bot]2021-07-15
|\| | | |
| * | | | nixos/vaultwarden: make package configurable (#113216)Antoine Martin2021-07-14
| * | | | nixos/snapraid: initlunik12021-07-14
* | | | | Merge remote-tracking branch 'upstream/master' into HEADJörg Thalheim2021-07-14
|\| | | |
| * | | | Merge pull request #124415 from misuzu/aarch64-boot-testGuillaume Girol2021-07-14
| |\ \ \ \