summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #91545 from Frostman/docker-19.03.12Maximilian Bosch2020-06-27
|\
| * docker: use git tags instead of revsSergey Lukjanov2020-06-26
* | Merge pull request #91666 from Atemu/undervolt-warningGraham Christensen2020-06-27
|\ \
| * | undervolt: clarify that the service is unofficialAtemu2020-06-27
* | | Merge pull request #91514 from NinjaTrappeur/nin-fix-nsdconfChristoph Hrdinka2020-06-26
|\ \ \
| * | | nixos/nsd: symlink conf file to /etc/nsdFélix Baylac-Jacqué2020-06-26
* | | | Merge pull request #91497 from 1000101/blockbookMarek Mahut2020-06-26
|\ \ \ \
| * | | | nixos/blockbook-frontend: add tests10001012020-06-26
| * | | | nixos/blockbook-frontend: init10001012020-06-26
* | | | | Merge pull request #90701 from nh2/issue-90613-fix-consul-reboot-testNiklas Hambüchen2020-06-26
|\ \ \ \ \
| * | | | | consul.passthru.tests: Add 2 more testsNiklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Refactor: Extract functionNiklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Use correct server health test.Niklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Refactor into functions.Niklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Fix failure on current consul. Fixes #90613.Niklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Refactor: Extract variableNiklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Refactor let bindingsNiklas Hambüchen2020-06-18
| * | | | | consul.passthru.tests: Refactor: Extract variableNiklas Hambüchen2020-06-18
* | | | | | Merge pull request #91613 from 1000101/1000101Marek Mahut2020-06-26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | maintainers: fix previously uncaught name issues10001012020-06-26
* | | | | | Merge pull request #91138 from zowoq/podmanzowoq2020-06-26
|\ \ \ \ \ \
| * | | | | | nixos/{podman,containers}: libpod.conf -> containers.confzowoq2020-06-26
| * | | | | | nixos/podman: use cgroupfs for rootless crun testzowoq2020-06-26
* | | | | | | Merge pull request #91458 from mdlayher/mdl-corerad-0.2.7zowoq2020-06-26
|\ \ \ \ \ \ \
| * | | | | | | nixos/corerad: set systemd unit Type=notifyMatt Layher2020-06-24
* | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-25
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge pull request #88940 from stigtsp/package/convos-initKim Lindberger2020-06-25
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | nixos/convos: add testStig Palmquist2020-06-22
| | * | | | | | nixos/convos: initStig Palmquist2020-06-22
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #77982 from symphorien/sshl_ipv6Timo Kaufmann2020-06-24
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | nixos: add test for sslhSymphorien Gibol2020-06-20
| | * | | | | nixos/sslh: make it possible (and the default) to listen on ipv6Symphorien Gibol2020-06-20
* | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-24
|\| | | | | |
| * | | | | | nixos/generic-extlinux-compatible: fix docbook syntaxFabian Möller2020-06-23
| | |_|_|/ / | |/| | | |
| * | | | | Merge #91363: small treewide: his -> theirs/itsVladimír Čunát2020-06-23
| |\ \ \ \ \
| | * | | | | small treewide: his -> theirs/itsProfpatsch2020-06-23
| * | | | | | Merge pull request #91195 from flokli/extlinux-conf-builder-dtbnameFlorian Klink2020-06-23
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | hardware.deviceTree: add nameFlorian Klink2020-06-21
| | * | | | | extlinux-conf-builder.sh: allow a custom FDT to be specifiedFlorian Klink2020-06-21
| | * | | | | nixos/sd-image-*: use boot.loader.generic-extlinux-compatible.populateCmdFlorian Klink2020-06-21
| | * | | | | nixos/generic-extlinux-compatible: introduce boot.loader.generic-extlinux-com...Florian Klink2020-06-21
| | * | | | | nixos/deviceTree: fix descriptionFlorian Klink2020-06-21
| * | | | | | tests/taskserver: fix gnutls invocationMarkus S. Wamser2020-06-23
| * | | | | | Merge pull request #91261 from rnhmjoj/intelMichele Guerini Rocco2020-06-23
| |\ \ \ \ \ \
| | * | | | | | nixos/doc: add section on Intel DDX driversrnhmjoj2020-06-22
| * | | | | | | Merge pull request #91216 from Mic92/nixos-config-generateJörg Thalheim2020-06-22
| |\ \ \ \ \ \ \
| | * | | | | | | nixos-generate-config: refer to nixos-hardwareJörg Thalheim2020-06-22
* | | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-22
|\| | | | | | | |
| * | | | | | | | Merge pull request #91214 from flokli/make-ext4-fs-fudge-factorFlorian Klink2020-06-21
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | nixos/make-ext4-fs: increase fudge factor from 1.03 to 1.10Florian Klink2020-06-21
| | | |_|/ / / / | | |/| | | | |