about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2018-03-15Merge commit '3ab2949' from staging into masterTuomas Tynkkynen53-93/+157
2018-03-15Merge pull request #36924 from etu/gitea-postgres-autocreate-databaseSamuel Leathers1-2/+36
2018-03-15gitea: enable and configure postgres service if selected as databaseElis Hirwing1-2/+36
2018-03-15nixos: fix install-grub.pl dependenciesJan Malakhovski1-1/+1
2018-03-14nixos/qemu-vm: Add virtualized display + HID devices on AArch64Tuomas Tynkkynen1-3/+5
2018-03-1418.09: let's call it "Jackrabbit"Vladimír Čunát2-2/+2
2018-03-14Merge pull request #36845 from jbedo/singularitylewo2-0/+21
2018-03-13Merge pull request #36706 from Ma27/xautolock-testcaseGraham Christensen2-0/+25
2018-03-13Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen10-23/+47
2018-03-13nixos/tests/virtualbox: Work around test failuresaszlig1-0/+3
2018-03-13xautolock: implement basic test to confirm functionalityMaximilian Bosch2-0/+25
2018-03-13Merge pull request #36850 from teto/virtualisationMichael Raskin3-5/+5
2018-03-13tests/docker-tools: add onTopOfPulledImage testAntoine Eiche1-4/+14
2018-03-12grafana: 5.0.0 -> 5.0.1WilliButz1-1/+1
2018-03-12nixos/tests/containers-tmpfs: fix test nameFranz Pletz1-1/+1
2018-03-12Merge pull request #36571 from srhb/acme-test-fixFranz Pletz1-4/+20
2018-03-12Merge pull request #36783 from Infinisil/desciption/update/resilioJörg Thalheim1-6/+1
2018-03-12grub-install.pl: more details on blkid failureMatthieu Coudron1-1/+1
2018-03-12build-vm: remove trailing dot from script pathMatthieu Coudron1-1/+1
2018-03-12qemu-vm: removes warning when running build-vmMatthieu Coudron1-3/+3
2018-03-12singularity: 2.4 -> 2.4.2Justin Bedo2-0/+21
2018-03-11resilio: Adjust option description to 3d17573Silvan Mosberger1-6/+1
2018-03-10Merge branch 'master' into stagingJan Malakhovski64-1186/+1396
2018-03-10nixos/network-interfaces: Fix 2 small typosSilvan Mosberger1-2/+2
2018-03-09Merge pull request #36357 from matthewbauer/vbox-usableJörg Thalheim2-0/+8
2018-03-08nixos/tests/acme: use mail-test-srv tls certs from sourceSarah Brofeldt1-1/+5
2018-03-08nixos/tests/acme: go compat update, unvendor pkcs11Sarah Brofeldt1-3/+15
2018-03-08Merge pull request #30418 from LnL7/inline-set-environmentDaiderd Jordan2-2/+2
2018-03-08nixos/tomcat: add types + proper systemd integrationJörg Thalheim1-204/+159
2018-03-08nixos/tomcat: add serverXml, environment files and log directoriesBenjamin Smith1-5/+52
2018-03-07Revert "Merge branch 'setuid-wrapper-readlink'"Shea Levy1-25/+11
2018-03-07Merge pull request #36292 from xeji/xen-4-10Michael Raskin1-3/+9
2018-03-07xen 4.10: link /etc/xen/oxenstored.confxeji1-0/+6
2018-03-07xen: fix broken version comparisonsxeji1-3/+3
2018-03-07Merge branch 'setuid-wrapper-readlink'Shea Levy1-11/+25
2018-03-07nixos: setuid-wrapper: simplify readlink logicShea Levy1-11/+25
2018-03-07nixos release: more evaluation fixesVladimír Čunát1-5/+9
2018-03-07nixos/release: fix evaluation if missing x86Vladimír Čunát1-7/+7
2018-03-07nixos doc: give context and definition re NIXOS_LUSTRATEobadz1-0/+12
2018-03-06Merge pull request #36367 from NixOS/yegortimoshenko-patch-1Jörg Thalheim1-1/+1
2018-03-06Merge pull request #35844 from adisbladis/jquery-mvadisbladis3-3/+67
2018-03-06nixos/tests/keymap: Remove OCR-friendly SLiM themeaszlig1-32/+1
2018-03-06tt-rss: use proper user and package for MySQLYegor Timoshenko1-1/+1
2018-03-05Merge pull request #36350 from volth/nix-serveJörg Thalheim1-0/+2
2018-03-05demo: autologin through xserverMatthew Bauer2-0/+8
2018-03-05nix-serve: nix 2.0 fixesvolth1-0/+2
2018-03-0518.03 -> 18.09Vladimír Čunát3-1/+84
2018-03-05Merge pull request #27678 from volth/restore-bridge-slaves-dynamically-added-...Frederik Rietdijk1-0/+11
2018-03-05nixos/initrd-network: add udhcpc.extraArgs option (#36305)Dino Dai Zovi1-1/+13
2018-03-05Merge pull request #30416 from symphorien/luksnokeyFranz Pletz1-2/+21