about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Expand)AuthorFilesLines
2019-05-01Merge pull request #60617 from nyanloutre/jellyfin_10_3_2Elis Hirwing1-0/+1
2019-05-01nixos/jellyfin: add test to all-tests.nixnyanloutre1-0/+1
2019-04-30Merge pull request #59630 from worldofpeace/setcap-gnome-keyringworldofpeace1-0/+5
2019-04-30Merge staging-next into masterFrederik Rietdijk2-2/+2
2019-04-30Merge pull request #60415 from johanot/kubernetes-fix-control-plane-online-unitSarah Brofeldt1-4/+3
2019-04-29nixos/kubernetes: fix control-plane-online prestart dependencyJohan Thomsen1-4/+3
2019-04-29Merge pull request #60377 from joachifm/feat/apparmor-systemdJoachim F1-1/+9
2019-04-29Merge master into staging-nextFrederik Rietdijk25-245/+721
2019-04-28browserpass: Remove v2 and switch to buildGoModule (#60282)Silvan Mosberger1-10/+0
2019-04-28nixos/luksroot: create /run/cryptsetup (#60235)Edmund Wu1-0/+3
2019-04-28nixos/apparmor: allow reloading profiles without losing confinementJoachim Fasting1-0/+3
2019-04-28nixos/apparmor: order before sysinit.targetJoachim Fasting1-1/+6
2019-04-28Merge pull request #60334 from bhipple/fix/doc-typoJoachim F1-1/+1
2019-04-28Merge pull request #59465 from minijackson/module-jellyfinAaron Andersen3-0/+77
2019-04-28nixos/sks: Fix another regression from ab5dcc7068bMichael Weiss1-11/+13
2019-04-28nixos/jellyfin: add simple testMinijackson1-0/+16
2019-04-28nixos/jellyfin: initMinijackson2-0/+61
2019-04-28documize-module: refactor and add more optionselseym1-50/+121
2019-04-28Revert "nixos/switch-to-configuration: Never stop system.slice"Michael Weiss1-18/+0
2019-04-27Merge pull request #59731 from ajs124/ejabberd_testSilvan Mosberger5-71/+334
2019-04-27sway: Read the configuration from /etc before /nix/store (#60319)Michael Weiss1-3/+3
2019-04-27nixos/sks: Fix the module (the pre-start script was broken)Michael Weiss1-1/+1
2019-04-27Merge pull request #60197 from etu/patch-gitea-generated-configSarah Brofeldt1-5/+10
2019-04-27nixos.grafana: fix docstring typoBenjamin Hipple1-1/+1
2019-04-27Merge pull request #60019 from aanderse/nzbgetFlorian Klink5-61/+73
2019-04-27Merge pull request #59424 from florianjacob/journalwatchAaron Andersen1-12/+30
2019-04-27Merge pull request #53444 from wedens/earlyoom-notificationsLassulus1-1/+14
2019-04-27nixos: Fix build of manualaszlig1-9/+9
2019-04-27Merge pull request #60223 from Ma27/write-i3cfg-to-etcMatthieu Coudron1-1/+4
2019-04-27Merge pull request #57561 from aaronjanse/patch-5Lassulus1-0/+26
2019-04-27Merge pull request #58181 from fgaz/nixos/zeronet/fix1Lassulus1-1/+12
2019-04-27Merge master into staging-nextFrederik Rietdijk6-85/+408
2019-04-26nixos/window-managers/i3: write config file to `/etc/i3/config`Maximilian Bosch1-1/+4
2019-04-26Merge pull request #60146 from peterhoeg/f/packagekitPeter Hoeg3-22/+54
2019-04-25nixos/nzbget: fix broken service, add a nixos test, as well as some general i...Aaron Andersen5-61/+73
2019-04-25nixos/gitea: Don't include not needed database options depending on typeElis Hirwing1-5/+10
2019-04-24nixos/journalwatch: permissionsStartOnly is deprecatedFlorian Jacob1-12/+30
2019-04-24Merge pull request #56565 from andrew-d/adunham/plex-fhsGraham Christensen1-63/+41
2019-04-24Merge pull request #53043 from exi/wg-quickRobin Gloster2-0/+313
2019-04-24Merge staging into staging-nextFrederik Rietdijk2-2/+2
2019-04-24nixos/packagekit: add testPeter Hoeg2-0/+25
2019-04-24nixos/packagekit: make it not error out and use upstream systemd unitPeter Hoeg1-22/+29
2019-04-24Merge pull request #60149 from peterhoeg/u/mosquitto_160Peter Hoeg2-0/+70
2019-04-24Merge pull request #60138 from grahamc/wireguard-generate-keyMaximilian Bosch3-9/+132
2019-04-24Wrap 'wg' commands in <command>Graham Christensen1-8/+8
2019-04-24wireguard: add generatePrivateKeyFile option + testGraham Christensen3-3/+126
2019-04-24nixos/mosquitto: add testPeter Hoeg2-0/+70
2019-04-23plex: rewrite to use FHS userenvAndrew Dunham1-63/+41
2019-04-23Merge remote-tracking branch 'NixOS/master' into stagingMatthew Bauer13-13/+422
2019-04-24Merge pull request #55413 from msteen/bitwarden_rsSilvan Mosberger3-0/+144