summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* 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
| |\ \ \ \
| | * | | | nixos/boot: test on aarch64misuzu2021-07-14
| | * | | | nixos/test-driver: allow overriding qemu binary in create_startcommandmisuzu2021-07-14
| * | | | | Merge pull request #120297 from rsynnest/masterRok Garbas2021-07-14
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/nixos/nixpkgsRoland Synnestvedt2021-07-13
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | nixos/unifi-video: init at 3.10.13rsynnest2021-05-31
| * | | | | | open-vm-tools: 11.2.5 -> 11.3.0 (#129978)Jeremy Kolb2021-07-14
| * | | | | | Merge pull request #119713 from uonr/masterSandro2021-07-13
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | nixos/ddclient: add support for IPv6Tachibana Kiyomi2021-07-14
| * | | | | | Merge pull request #129833 from oxzi/claws-mail-3.18.0_4.0.0ajs1242021-07-13
| |\ \ \ \ \ \
| | * | | | | | claws-mail: 3.17.8 -> 4.0.0Alvar Penning2021-07-12
| * | | | | | | Merge pull request #129734 from yu-re-ka/feature/gitlab-14-0-5Florian Klink2021-07-13
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/gitlab: improve psql assertion messageYureka2021-07-12
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #129620 from bbenno/update-nextcloudLinus Heckemann2021-07-12
| |\ \ \ \ \ \ \
| | * | | | | | | nextcloud22: init at 22.0.0Maximilian Bosch2021-07-08
* | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-07-12
|\| | | | | | | |
| * | | | | | | | Merge pull request #129934 from mattchrist/nixos/bind-packageRobert Hensing2021-07-12
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | nixos/bind: allow specifying BIND packageMatt Christ2021-07-11
* | | | | | | | | Merge master into staging-nextgithub-actions[bot]2021-07-12
|\| | | | | | | |
| * | | | | | | | Merge pull request #118630 from mmilata/lndmon-210326Pavol Rusnak2021-07-12
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | nixos/prometheus-lnd-exporter: fix testMartin Milata2021-07-12
* | | | | | | | | Merge remote-tracking branch 'origin/master' into staging-nextMartin Weinelt2021-07-11
|\| | | | | | | |
| * | | | | | | | nixos-option: add backwards compatibility layerRobert Helgesson2021-07-10
| * | | | | | | | kops: default to 1.21.0, drop 1.18 (#129472)Eric Bailey2021-07-10
| * | | | | | | | nixos/prometheus: add password_file option to scrapeConfig's basic_auth (#123...n0emis2021-07-10