summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* nixos/tests/virtualbox: Work around test failuresaszlig2018-03-13
* Merge pull request #36850 from teto/virtualisationMichael Raskin2018-03-13
|\
| * grub-install.pl: more details on blkid failureMatthieu Coudron2018-03-12
| * build-vm: remove trailing dot from script pathMatthieu Coudron2018-03-12
| * qemu-vm: removes warning when running build-vmMatthieu Coudron2018-03-12
* | tests/docker-tools: add onTopOfPulledImage testAntoine Eiche2018-03-13
* | grafana: 5.0.0 -> 5.0.1WilliButz2018-03-12
* | nixos/tests/containers-tmpfs: fix test nameFranz Pletz2018-03-12
* | Merge pull request #36571 from srhb/acme-test-fixFranz Pletz2018-03-12
|\ \
| * | nixos/tests/acme: use mail-test-srv tls certs from sourceSarah Brofeldt2018-03-08
| * | nixos/tests/acme: go compat update, unvendor pkcs11Sarah Brofeldt2018-03-08
* | | Merge pull request #36783 from Infinisil/desciption/update/resilioJörg Thalheim2018-03-12
|\ \ \
| * | | resilio: Adjust option description to 3d17573Silvan Mosberger2018-03-11
* | | | nixos/network-interfaces: Fix 2 small typosSilvan Mosberger2018-03-10
|/ / /
* | | Merge pull request #36357 from matthewbauer/vbox-usableJörg Thalheim2018-03-09
|\ \ \
| * | | demo: autologin through xserverMatthew Bauer2018-03-05
* | | | Merge pull request #30418 from LnL7/inline-set-environmentDaiderd Jordan2018-03-08
|\ \ \ \ | |_|/ / |/| | |
| * | | nixos: inline set-environment for bash and zshDaiderd Jordan2017-10-14
* | | | nixos/tomcat: add types + proper systemd integrationJörg Thalheim2018-03-08
* | | | nixos/tomcat: add serverXml, environment files and log directoriesBenjamin Smith2018-03-08
* | | | Revert "Merge branch 'setuid-wrapper-readlink'"Shea Levy2018-03-07
* | | | Merge pull request #36292 from xeji/xen-4-10Michael Raskin2018-03-07
|\ \ \ \
| * | | | xen 4.10: link /etc/xen/oxenstored.confxeji2018-03-07
| * | | | xen: fix broken version comparisonsxeji2018-03-07
* | | | | Merge branch 'setuid-wrapper-readlink'Shea Levy2018-03-07
|\ \ \ \ \
| * | | | | nixos: setuid-wrapper: simplify readlink logicShea Levy2018-03-07
* | | | | | nixos release: more evaluation fixesVladimír Čunát2018-03-07
* | | | | | nixos/release: fix evaluation if missing x86Vladimír Čunát2018-03-07
| |/ / / / |/| | | |
* | | | | nixos doc: give context and definition re NIXOS_LUSTRATEobadz2018-03-07
* | | | | Merge pull request #36367 from NixOS/yegortimoshenko-patch-1Jörg Thalheim2018-03-06
|\ \ \ \ \
| * | | | | tt-rss: use proper user and package for MySQLYegor Timoshenko2018-03-06
* | | | | | Merge pull request #35844 from adisbladis/jquery-mvadisbladis2018-03-06
|\ \ \ \ \ \
| * | | | | | jquery & jquery-ui: Move to nixos/lib/testing/adisbladis2018-02-27
| | |/ / / / | |/| | | |
* | | | | | nixos/tests/keymap: Remove OCR-friendly SLiM themeaszlig2018-03-06
| |/ / / / |/| | | |
* | | | | Merge pull request #36350 from volth/nix-serveJörg Thalheim2018-03-05
|\ \ \ \ \
| * | | | | nix-serve: nix 2.0 fixesvolth2018-03-05
| | |_|_|/ | |/| | |
* | | | | 18.03 -> 18.09Vladimír Čunát2018-03-05
* | | | | Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-...Frederik Rietdijk2018-03-05
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add separator in case if a VM connected to more than 1 bridgeVolth2017-08-21
| * | | | support lxc:/// and ignore weird bridges (like openvswitch)Volth2017-08-01
| * | | | nixos/networking-scripted: restore bridge slaves dynamically added by libvirtVolth2017-07-27
* | | | | nixos/initrd-network: add udhcpc.extraArgs option (#36305)Dino Dai Zovi2018-03-05
| |/ / / |/| | |
* | | | Merge pull request #30416 from symphorien/luksnokeyFranz Pletz2018-03-05
|\ \ \ \
| * | | | luksroot.nix: rename fallback to fallbackToPasswordSymphorien Gibol2017-12-14
| * | | | nixos/luksroot.nix: add option boot.initrd.luks.devices.<name?>.fallbackSymphorien Gibol2017-10-23
| * | | | nixos/luksroot.nix: fallback to interactive password entry when no keyfile foundSymphorien Gibol2017-10-14
* | | | | LightDM: Set default user session when possible.Will Fancher2018-03-04
* | | | | Merge pull request #32248 from awakesecurity/parnell/fetchdockerFranz Pletz2018-03-04
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-02-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-01-10
| |\ \ \ \ \ \