about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2020-08-31Merge pull request #83780 from hax404/robustirc-bridgeLassulus4-0/+78
2020-08-31Merge pull request #96610 from romildo/rm.deepinFrederik Rietdijk2-124/+0
2020-08-31nixos/tests/robustirc-bridge: initGeorg Haas2-0/+30
2020-08-31Merge pull request #96149 from JJJollyjim/acme-test-go-15Arian van Putten2-153/+155
2020-08-30Merge pull request #96712 from andersk/disable-macvlanWORLDofPEACE1-1/+2
2020-08-30nixosTests: Disable networking.networkd.macvlanAnders Kaseorg1-1/+2
2020-08-30Merge pull request #96703 from andersk/revert-test-loggingWORLDofPEACE2-156/+222
2020-08-30Revert "Merge pull request #96254 from Mic92/logging"Anders Kaseorg2-145/+222
2020-08-30Revert "Merge pull request #96152 from JJJollyjim/colour-test-machines-staging"Anders Kaseorg1-13/+2
2020-08-30Merge pull request #96686 from nixy/add/tor-package-optionSilvan Mosberger1-5/+15
2020-08-30nixosTests.systemd-networkd: fix test flakinessFélix Baylac-Jacqué1-4/+5
2020-08-30Add option to tor service for packageAndrew R. M1-5/+15
2020-08-30deepin: remove from nixpkgsJosé Romildo Malaquias2-124/+0
2020-08-30nixos/modules/robustirc-bridge: initGeorg Haas2-0/+48
2020-08-29Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]"Matthew Bauer1-7/+0
2020-08-29nixos/tests/systemd-networkd: fix evalMaximilian Bosch1-1/+1
2020-08-29Merge pull request #96589 from deviant/nre-improvementsedef1-1/+4
2020-08-29Merge pull request #96571 from aszlig/nixos-tests-sleep-guest-timeFlorian Klink1-1/+2
2020-08-29Merge pull request #85328 from langston-barrett/lb/restart-dispatcherLassulus1-1/+1
2020-08-29Merge pull request #96316 from aanderse/redmineAaron Andersen1-57/+45
2020-08-29Merge pull request #95880 from aanderse/postgresql-settingsAaron Andersen2-26/+54
2020-08-29Merge master into staging-nextFrederik Rietdijk14-1268/+383
2020-08-29Merge pull request #94804 from hercules-ci/init-nixos-hercules-ci-agentRobert Hensing4-0/+305
2020-08-29nixos-rebuild: don't quote $EDITORV1-1/+1
2020-08-29nixos-rebuild: make 'edit' work with directoriesV1-0/+3
2020-08-29nixos/test-driver: Use guest time when using sleepaszlig1-1/+2
2020-08-28Merge pull request #96396 from flokli/remove-perl-test-driverworldofpeace6-1267/+10
2020-08-28Merge pull request #95888 from bzizou/charliecloud18Daniël de Kok2-0/+44
2020-08-28charliecloud: 0.12 -> 0.18 (docker + ch-grow support)Bruno Bzeznik2-0/+44
2020-08-28Merge pull request #86486 from flokli/networking-tests-addMaximilian Bosch1-0/+17
2020-08-28Merge pull request #96497 from NickHackman/emacs-documentation-typo-fixDaniël de Kok1-1/+1
2020-08-28Merge pull request #96034 from saschagrunert/apparmorJoachim F1-0/+6
2020-08-28Merge master into staging-nextFrederik Rietdijk4-3/+35
2020-08-27Fix typo in services/editors/emacs documentationNick Hackman1-1/+1
2020-08-27Merge pull request #96460 from sorki/sdImage_post_buildLassulus1-0/+12
2020-08-27nixos/sdImage: add postBuildCommandsRichard Marko1-0/+12
2020-08-27nixos/lib/test*: remove perl test driverFlorian Klink6-1267/+10
2020-08-27Merge pull request #96218 from matthewbauer/cage-supply-pam-environmentMatthew Bauer1-0/+1
2020-08-27nixos/cage: supply pamEnvironmentMatthew Bauer1-0/+1
2020-08-27nixos/test: colour machine namesJamie McClymont1-2/+13
2020-08-27nixosTests: re-enable networking testsFlorian Klink1-0/+17
2020-08-27Merge pull request #85963 from seqizz/g_physlock_messageLassulus1-1/+9
2020-08-26Merge pull request #96404 from matthewbauer/gcc-crossMatthew Bauer21-533/+603
2020-08-26nixos/postgresql: replace extraConfig option with settings optionAaron Andersen2-26/+54
2020-08-26Merge pull request #96349 from helsinki-systems/feat/postgresql-wal-pythonFlorian Klink1-89/+97
2020-08-26Merge pull request #96254 from Mic92/loggingJörg Thalheim2-222/+145
2020-08-26Merge pull request #95956 from matthewbauer/qemu-cpu-maxMatthew Bauer2-3/+3
2020-08-26Merge pull request #86236 from ThibautMarty/fix-nullOr-typesLassulus9-10/+10
2020-08-26nixos installer tests: add a missing packageVladimír Čunát1-0/+1
2020-08-26Merge pull request #96127 from hmenke/shadowsocksLassulus3-3/+114