summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingVladimír Čunát2017-11-27
|\
| * nixos/xserver: fix X.org session script loggingrnhmjoj2017-11-27
| * tests/initrd-network-ssh: Don't build during evaluationTuomas Tynkkynen2017-11-27
| * owncloud: Don't build during evaluationTuomas Tynkkynen2017-11-27
| * pulseaudio/nixos: set it as default for openal/libao if enabled (#32078)Peter Hoeg2017-11-27
| * nixos/qemu-guest: Ensure virtio_mmio is available in initrdTuomas Tynkkynen2017-11-26
| * nixos/qemu: Add virtio-rng-pci to test-driverTuomas Tynkkynen2017-11-26
| * nixos/qemu-vm: Use different serial port on ARM/AArch64Tuomas Tynkkynen2017-11-26
| * nixos/qemu-vm: Don't try enabling graphics/mouse on non-x86Tuomas Tynkkynen2017-11-26
| * nixos/qemu-vm: Set QEMU command line depending on architectureTuomas Tynkkynen2017-11-26
| * buildkite-agent: secrecy improvements: non-store, non-Nix provisioning of s...Kosyrev Serge2017-11-25
| * Merge pull request #31283 from michalrus/per-user-profiles-buildEnvJörg Thalheim2017-11-25
| |\
| | * users-groups module: use `buildEnv` in per-user profilesMichal Rus2017-11-05
| * | Merge pull request #31048 from LumiGuide/fix-owncloudJoachim F2017-11-25
| |\ \
| | * | owncloud: fix some but not all errorsBas van Dijk2017-10-31
* | | | Merge #29392: gnome3: 3.24 -> 3.26Vladimír Čunát2017-11-27
|\ \ \ \
| * | | | nixos/gnome3: override schemas using env variableJan Tojnar2017-11-26
| * | | | nixos/tracker-miners: initJan Tojnar2017-11-26
* | | | | Merge #31683: glib: Add variable for overriding schemasVladimír Čunát2017-11-27
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | nixos/gnome3: override schemas using env variableJan Tojnar2017-11-15
* | | | | Merge pull request #31995 from jtojnar/xserver-libinputOrivej Desh2017-11-25
|\ \ \ \ \
| * | | | | nixos/xserver: let X choose the xkb rulesJan Tojnar2017-11-25
| * | | | | nixos/libinput: load configuration fileJan Tojnar2017-11-24
* | | | | | nixos/munin: fix broken plugin wrappersKjetil Orbekk2017-11-25
* | | | | | nixos/fwupd: disable by defaultOrivej Desh2017-11-25
* | | | | | nixos.tests.installer.swraid: increase drive sizeVladimír Čunát2017-11-25
* | | | | | Merge branch 'staging' (older one)Vladimír Čunát2017-11-24
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into stagingOrivej Desh2017-11-21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into stagingOrivej Desh2017-11-20
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into stagingFranz Pletz2017-11-19
| |\ \ \ \ \ \ \ \
| * | | | | | | | | nixos/testing: fix after --set ceased to evaluate the valueOrivej Desh2017-11-19
* | | | | | | | | | Merge pull request #31371 from gnidorah/swayFranz Pletz2017-11-24
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | sway module: passthrough sway binary when neededgnidorah2017-11-07
* | | | | | | | | | | Merge pull request #31839 from bluescreen303/fix-rpfilterFranz Pletz2017-11-24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | firewall: fix rpfilter blocking dhcp offers when no ip was bound yetMathijs Kwik2017-11-19
* | | | | | | | | | | | Merge pull request #30252 from jtojnar/fwupdJan Tojnar2017-11-24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | nixos/services.fwupd: allow adding trusted keysJan Tojnar2017-11-23
| * | | | | | | | | | | | nixos/services.fwupd: initJan Tojnar2017-11-17
* | | | | | | | | | | | | Merge pull request #31972 from bkchr/copyfilefromhost_missing_documentationGraham Christensen2017-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Adds missing documentation for copyFileFromHost in NixOS testsBastian Köcher2017-11-23
* | | | | | | | | | | | | | Merge pull request #31973 from grahamc/options-fix-inginiousGraham Christensen2017-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | inginious: fix options evalGraham Christensen2017-11-23
* | | | | | | | | | | | | | | Merge pull request #27513 from lukeadams/prl-tools-fixJörg Thalheim2017-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | remove prlcc from global systemd servicesLuke Adams2017-11-11
| * | | | | | | | | | | | | | | prl-tools: Add all user services using systemd.userLuke Adams2017-11-11
| * | | | | | | | | | | | | | | prl-tools: remove unnecessary kernel modulesLuke Adams2017-11-11
* | | | | | | | | | | | | | | | Merge pull request #31941 from Rovanion/masterJörg Thalheim2017-11-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | nixos/manual: extraUsers -> users in user-mgmt.xmlRovanion Luckey2017-11-23
* | | | | | | | | | | | | | | | nixos/doc/manual: print context on failing xmllint validationProfpatsch2017-11-22
* | | | | | | | | | | | | | | | hydra: 2017-10-26 -> 2017-11-21Domen Kožar2017-11-22
|/ / / / / / / / / / / / / / /