summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #41367 from andir/nixos-mpd-dbFile-nullAndreas Rammhold2018-06-01
|\
| * nixos/mpd: allow services.mpd.dbFile to be nullAndreas Rammhold2018-06-01
* | Merge branch 'plat-fix-for-merge-2' into masterTuomas Tynkkynen2018-06-01
|\ \ | |/ |/|
| * nixos/sd-image-raspberrypi: Support Raspberry Pi ZeroTuomas Tynkkynen2018-06-01
* | tests/containers-imperative: Include stdenvNoCCaszlig2018-06-01
* | Revert "nixos: disable gdk-pixbuf test"Jan Tojnar2018-06-01
* | dnscrypt-proxy: make man 8 dnscrypt-proxy work (#41039)coretemp2018-05-31
* | Revert "nixpkgs module: Fix defaulting of `localSystem` and `system`"Matthew Bauer2018-05-31
* | nixos: disable gdk-pixbuf testMatthew Bauer2018-05-31
* | zsh: only do promptInit when TERM!=dumbMatthew Bauer2018-05-31
* | qemu-flags: default to qemu-kvmMatthew Bauer2018-05-31
* | Merge pull request #40708 from obsidiansystems/nixos-nixpkgs-defaultsMatthew Justin Bauer2018-05-31
|\ \
| * | nixpkgs module: Fix defaulting of `localSystem` and `system`John Ericson2018-05-17
* | | Merge pull request #41218 from Gerschtli/fix/gitea-pre-startJoachim F2018-05-31
|\ \ \
| * | | nixos/gitea: fix pre start scriptTobias Happ2018-05-29
* | | | nix: 2.0.3 -> 2.0.4Eelco Dolstra2018-05-31
* | | | Update GCE image for 18.03Rob Vermaas2018-05-30
* | | | nix: 2.0.2 -> 2.0.3Eelco Dolstra2018-05-30
* | | | Merge pull request #40579 from peterhoeg/m/sddmPeter Hoeg2018-05-30
|\ \ \ \
| * | | | sddm: add support for hidpi modePeter Hoeg2018-05-16
* | | | | nixos/bind: Allow to set extra optionsaszlig2018-05-30
* | | | | Merge pull request #38791 from LnL7/nixos-profile-variablesDaiderd Jordan2018-05-30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | nixos: remove PKG_CONFIG_PATH and PERL5LIB environment variablesDaiderd Jordan2018-04-11
* | | | | nixos.modules.tasks.swraid: add raid10 module to initrdNathaniel McCallum2018-05-28
* | | | | fix: connect the --bind-address arg to the cfg.apiserver.address optionGeoffrey Huntley2018-05-28
* | | | | Merge pull request #39482 from Chiiruno/init/megucaJörg Thalheim2018-05-27
|\ \ \ \ \
| * | | | | meguca: git-2018-05-17 -> git-2018-05-20Okina Matara2018-05-26
| * | | | | meguca: init at git-2018-05-17Okina Matara2018-05-26
* | | | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-26
|\| | | | |
| * | | | | Merge pull request #41073 from johanot/kube-1.10Sarah Brofeldt2018-05-26
| |\ \ \ \ \
| | * | | | | Kubernetes:Johan Thomsen2018-05-26
| | * | | | | Kubernetes tests: increase the size of the VM from 700MB to 1.5GBAlberto Berti2018-05-25
| | * | | | | Kuberetes Dashboard addon 1.8.2 -> 1.8.3Alberto Berti2018-05-25
| | * | | | | Kuberbetes DNS addon 1.14.4 -> 1.14.10Alberto Berti2018-05-25
| | * | | | | kubernetes: update to 1.10Charles Strahan2018-05-25
| * | | | | | ids: assing openvpnPeter Hoeg2018-05-26
| |/ / / / /
* | | | | | Merge branch 'master' into stagingJan Malakhovski2018-05-26
|\| | | | |
| * | | | | w3m: Add a variant without graphics support and use for NixOS manualTuomas Tynkkynen2018-05-25
| * | | | | nixos/installer: Drop dmraidTuomas Tynkkynen2018-05-25
| * | | | | nixos/systemd-timesyncd: use the correct server list (#40919)Daniel Frank2018-05-24
| * | | | | nixos/slurm: fix xml tag mismatch in manualUli Baum2018-05-24
| * | | | | Merge pull request #40947 from samueldr/fix/34779lewo2018-05-24
| |\ \ \ \ \
| | * | | | | tests/docker-tools: Adds regression test for #34779Samuel Dionne-Riel2018-05-24
| * | | | | | Merge pull request #40665 from seppeljordan/fix-kubernetes-moduleslewo2018-05-24
| |\ \ \ \ \ \
| | * | | | | | nixos/kubernetes: Update kube-dns and kube-dashbashboard docker image derivat...Sebastian Jordan2018-05-16
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #41016 from markuskowa/slurm-prxeji2018-05-24
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | nixos/slurm: add slurm test to release.nixMarkus Kowalewski2018-05-24
| | * | | | | nixos/slurm: enable munge by default, added note to slurm descriptionMarkus Kowalewski2018-05-24
| | * | | | | slurm/module: add ProcTrackType option to unbreak default setupMarkus Kowalewski2018-05-24
| * | | | | | nixos mysql: make start-up more robust (#41010)Peter Hoeg2018-05-24