summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #96712 from andersk/disable-macvlanWORLDofPEACE2020-08-30
|\
| * nixosTests: Disable networking.networkd.macvlanAnders Kaseorg2020-08-30
* | Merge pull request #96703 from andersk/revert-test-loggingWORLDofPEACE2020-08-30
|\ \ | |/ |/|
| * Revert "Merge pull request #96254 from Mic92/logging"Anders Kaseorg2020-08-30
| * Revert "Merge pull request #96152 from JJJollyjim/colour-test-machines-staging"Anders Kaseorg2020-08-30
* | Merge pull request #96686 from nixy/add/tor-package-optionSilvan Mosberger2020-08-30
|\ \
| * | Add option to tor service for packageAndrew R. M2020-08-30
* | | nixosTests.systemd-networkd: fix test flakinessFélix Baylac-Jacqué2020-08-30
| |/ |/|
* | Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]"Matthew Bauer2020-08-29
* | nixos/tests/systemd-networkd: fix evalMaximilian Bosch2020-08-29
* | Merge pull request #96589 from deviant/nre-improvementsedef2020-08-29
|\ \
| * | nixos-rebuild: don't quote $EDITORV2020-08-29
| * | nixos-rebuild: make 'edit' work with directoriesV2020-08-29
* | | Merge pull request #96571 from aszlig/nixos-tests-sleep-guest-timeFlorian Klink2020-08-29
|\ \ \
| * | | nixos/test-driver: Use guest time when using sleepaszlig2020-08-29
| |/ /
* | | Merge pull request #85328 from langston-barrett/lb/restart-dispatcherLassulus2020-08-29
|\ \ \
| * | | nixos/networkmanager: restart dispatcher when nameservers changeLangston Barrett2020-04-15
* | | | Merge pull request #96316 from aanderse/redmineAaron Andersen2020-08-29
|\ \ \ \
| * | | | nixos/redmine: remove database.password optionAaron Andersen2020-08-26
| * | | | nixos/redmine: allow user to override contents of additional_environment.rbAaron Andersen2020-08-26
| * | | | nixos/redmine: replace extraConfig option with settings optionAaron Andersen2020-08-26
* | | | | Merge pull request #95880 from aanderse/postgresql-settingsAaron Andersen2020-08-29
|\ \ \ \ \
| * | | | | nixos/postgresql: replace extraConfig option with settings optionAaron Andersen2020-08-26
* | | | | | Merge master into staging-nextFrederik Rietdijk2020-08-29
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #94804 from hercules-ci/init-nixos-hercules-ci-agentRobert Hensing2020-08-29
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | nixos/hercules-ci-agent: initRobert Hensing2020-08-23
| * | | | | | Merge pull request #96396 from flokli/remove-perl-test-driverworldofpeace2020-08-28
| |\ \ \ \ \ \
| | * | | | | | nixos/lib/test*: remove perl test driverFlorian Klink2020-08-27
| * | | | | | | Merge pull request #95888 from bzizou/charliecloud18Daniël de Kok2020-08-28
| |\ \ \ \ \ \ \
| | * | | | | | | charliecloud: 0.12 -> 0.18 (docker + ch-grow support)Bruno Bzeznik2020-08-28
| * | | | | | | | Merge pull request #86486 from flokli/networking-tests-addMaximilian Bosch2020-08-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixosTests: re-enable networking testsFlorian Klink2020-08-27
| * | | | | | | | | Merge pull request #96497 from NickHackman/emacs-documentation-typo-fixDaniël de Kok2020-08-28
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix typo in services/editors/emacs documentationNick Hackman2020-08-27
| * | | | | | | | | | Merge pull request #96034 from saschagrunert/apparmorJoachim F2020-08-28
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | apparmor: add apparmor_parser config fileSascha Grunert2020-08-22
* | | | | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-08-28
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #96460 from sorki/sdImage_post_buildLassulus2020-08-27
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | nixos/sdImage: add postBuildCommandsRichard Marko2020-08-27
| * | | | | | | | | | Merge pull request #96218 from matthewbauer/cage-supply-pam-environmentMatthew Bauer2020-08-27
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nixos/cage: supply pamEnvironmentMatthew Bauer2020-08-27
| * | | | | | | | | | | nixos/test: colour machine namesJamie McClymont2020-08-27
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #85963 from seqizz/g_physlock_messageLassulus2020-08-27
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | physlock: add optional lock messageGürkan Gür2020-04-24
* | | | | | | | | | | Merge pull request #96404 from matthewbauer/gcc-crossMatthew Bauer2020-08-26
|\| | | | | | | | | |
| * | | | | | | | | | Merge pull request #96349 from helsinki-systems/feat/postgresql-wal-pythonFlorian Klink2020-08-26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | tests/postgresql-wal-receiver: Port to PythonJanne Heß2020-08-26
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #96254 from Mic92/loggingJörg Thalheim2020-08-26
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | nixos/test-driver: re-introduce log()Jörg Thalheim2020-08-25
| | * | | | | | | | | | nixos/testdriver: sort importsJörg Thalheim2020-08-25