summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge staging-next into stagingFrederik Rietdijk2020-06-05
|\
| * Merge master into staging-nextFrederik Rietdijk2020-06-05
| |\
| | * Merge pull request #85418 from lopsided98/grub-initrd-secretsJörg Thalheim2020-06-05
| | |\
| | | * nixos/grub: support initrd secretsBen Wolsieffer2020-06-04
| | | * nixos/stage-1: make boot.initrd.secrets appear in the manualBen Wolsieffer2020-06-04
| | * | Merge pull request #87878 from Izorkin/mariadb-updateFlorian Klink2020-06-05
| | |\ \
| | | * | nixos/tests/mysql80: add check with unix authIzorkin2020-05-23
| | | * | nixos/tests/mysql57: add check with unix authIzorkin2020-05-23
| | * | | Merge pull request #89479 from edolstra/nix-2.4-completionEelco Dolstra2020-06-05
| | |\ \ \
| | | * | | Don't enable nix-bash-completions when using Nix 2.4Eelco Dolstra2020-06-04
| | * | | | Merge pull request #89525 from Mic92/cgmanagerJörg Thalheim2020-06-05
| | |\ \ \ \
| | | * | | | cgmanager: removeJörg Thalheim2020-06-05
| | | |/ / /
| | * | | | Merge pull request #89510 from flokli/buildbot-pbPortFlorian Klink2020-06-05
| | |\ \ \ \
| | | * | | | nixos/buildbot-master: fix typo in services.buildbot-master.bpPortFlorian Klink2020-06-05
| | | |/ / /
| | * / / / gitlab: 12.10.8 -> 13.0.3Robin Gloster2020-06-04
| | |/ / /
* | | | | Merge #82342: rustPlatform: increase build-speed of `checkPhase`Vladimír Čunát2020-06-05
|\ \ \ \ \
| * | | | | rust: improve docsMaximilian Bosch2020-05-31
| * | | | | rust*: add docs for testing packagesMaximilian Bosch2020-05-24
* | | | | | python3: now points to python38Frederik Rietdijk2020-06-04
| |/ / / / |/| | | |
* | | | | Merge master into staging-nextFrederik Rietdijk2020-06-04
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #89407 from primeos/empty-hostname-fixMichael Weiss2020-06-03
| |\ \ \ \
| | * | | | nixos: Allow empty hostnames againMichael Weiss2020-06-03
| * | | | | nix: 2.3.6 -> 2.3.6Eelco Dolstra2020-06-03
| |/ / / /
| * | | | Merge pull request #89337 from mweinelt/hass-yaml-funJörg Thalheim2020-06-03
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | nixos/home-assistant: allow arbitrary yaml functionsMartin Weinelt2020-06-02
| * | | | Merge pull request #60174 from exarkun/patch-2Graham Christensen2020-06-02
| |\ \ \ \
| | * | | | Fix the rootPartitionUUID descriptionJean-Paul Calderone2019-04-24
| * | | | | Merge pull request #51270 from aneeshusa/enable-setuid-wrapper-for-chshJörg Thalheim2020-06-02
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | nixos/shadow: create setuid wrapper for chshAneesh Agrawal2019-04-07
| * | | | | Merge pull request #82258 from erikarvstedt/fix-xchg-cachingFlorian Klink2020-06-01
| |\ \ \ \ \
| | * | | | | qemu-vm: fix inconsistent caching of xchg dirsErik Arvstedt2020-06-01
| | * | | | | test-driver: remove useless syncsErik Arvstedt2020-05-27
| * | | | | | Merge pull request #88744 from davidak/chromium-exampleLassulus2020-06-01
| |\ \ \ \ \ \
| | * | | | | | nixos/chromium: add example and update descriptiondavidak2020-05-24
| * | | | | | | Merge pull request #89274 from flokli/nscd-disable-positive-hosts-cachingFlorian Klink2020-06-01
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/nscd: set positive hosts caching ttl to 0Florian Klink2020-06-01
| * | | | | | | | Merge pull request #89240 from jakobrs/formally-to-formerlyMaximilian Bosch2020-06-01
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos/libvirtd: correct spellingjakobrs2020-05-31
| * | | | | | | | | Merge pull request #73350 from NixOS/wmertens-nixos-boot-docWout Mertens2020-06-01
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | nixos doc: clarify role of boot.debug1devicesWout Mertens2019-11-13
| | * | | | | | | | | nixos boot doc: document boot.debug1devicesWout Mertens2019-11-13
| * | | | | | | | | | nixos/mautrix-telegram: add module (#63589)Notkea2020-06-01
| * | | | | | | | | | matrix-appservice-discord: init at 0.5.2 (#62744)Notkea2020-06-01
| * | | | | | | | | | nixos/doc: update stale fn name s/copy_file_from_host/copy_from_host/Tom Fitzhenry2020-06-01
| * | | | | | | | | | Merge pull request #83307 from servalcatty/fix/v2ray-checkMario Rodas2020-05-31
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nixos/v2ray: check v2ray config during the build timeServal2020-03-25
| * | | | | | | | | | | Merge pull request #88434 from pstch/patch-2Florian Klink2020-05-31
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | nixos/haproxy: add reloading support, use upstream service hardeningHugo Geoffroy2020-05-31
| * | | | | | | | | | | | Merge pull request #62671 from kfiz/networking-proxy_arp-fixFlorian Klink2020-05-31
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | networking-interfaces.nix: remove broken NDP bits from proxyARPDoro Rose2020-05-26