summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* softether: 4.25 -> 4.29 (#60665)Hsiang-Cheng Yang2019-05-02
* Merge pull request #60543 from Infinisil/fix/znc-genSilvan Mosberger2019-05-02
|\
| * nixos/znc: Fix config generator for certain null valuesSilvan Mosberger2019-05-01
* | Merge pull request #55771 from Infinisil/nixos/znapzend/parallelSilvan Mosberger2019-05-02
|\ \
| * | nixos/znapzend: Run znapzendzetup import in parallelSilvan Mosberger2019-02-14
* | | Merge pull request #55422 from nand0p/ethminerSilvan Mosberger2019-05-02
|\ \ \
| * | | nixos/ethminer: initFernando J Pando2019-05-01
* | | | Merge pull request #60097 from Mic92/openldap-rootpw-fileSilvan Mosberger2019-05-01
|\ \ \ \
| * | | | nixos/openldap: make rootpw option optionalJörg Thalheim2019-04-23
* | | | | Merge pull request #60617 from nyanloutre/jellyfin_10_3_2Elis Hirwing2019-05-01
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | nixos/jellyfin: add test to all-tests.nixnyanloutre2019-05-01
* | | | | Merge pull request #59630 from worldofpeace/setcap-gnome-keyringworldofpeace2019-04-30
|\ \ \ \ \
| * | | | | gnome3.gnome-keyring: CAP_IPC_LOCK gnome-keyring-daemonworldofpeace2019-04-15
* | | | | | Merge staging-next into masterFrederik Rietdijk2019-04-30
|\ \ \ \ \ \
| * \ \ \ \ \ Merge master into staging-nextFrederik Rietdijk2019-04-29
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge master into staging-nextFrederik Rietdijk2019-04-27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging into staging-nextFrederik Rietdijk2019-04-24
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'NixOS/master' into stagingMatthew Bauer2019-04-23
| | |\ \ \ \ \ \ \
| | * | | | | | | | nixos/virtualbox: Fixes configuration to evaluateSamuel Dionne-Riel2019-04-22
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer2019-04-20
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into stagingJan Tojnar2019-04-20
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2019-04-18
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemasworldofpeace2019-04-17
* | | | | | | | | | | | | Merge pull request #60415 from johanot/kubernetes-fix-control-plane-online-unitSarah Brofeldt2019-04-30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nixos/kubernetes: fix control-plane-online prestart dependencyJohan Thomsen2019-04-29
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #60377 from joachifm/feat/apparmor-systemdJoachim F2019-04-29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | nixos/apparmor: allow reloading profiles without losing confinementJoachim Fasting2019-04-28
| * | | | | | | | | | | | nixos/apparmor: order before sysinit.targetJoachim Fasting2019-04-28
* | | | | | | | | | | | | browserpass: Remove v2 and switch to buildGoModule (#60282)Silvan Mosberger2019-04-28
* | | | | | | | | | | | | nixos/luksroot: create /run/cryptsetup (#60235)Edmund Wu2019-04-28
* | | | | | | | | | | | | Merge pull request #60334 from bhipple/fix/doc-typoJoachim F2019-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nixos.grafana: fix docstring typoBenjamin Hipple2019-04-27
* | | | | | | | | | | | | | Merge pull request #59465 from minijackson/module-jellyfinAaron Andersen2019-04-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/jellyfin: add simple testMinijackson2019-04-28
| * | | | | | | | | | | | | | nixos/jellyfin: initMinijackson2019-04-28
* | | | | | | | | | | | | | | nixos/sks: Fix another regression from ab5dcc7068bMichael Weiss2019-04-28
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | documize-module: refactor and add more optionselseym2019-04-28
* | | | | | | | | | | | | | Revert "nixos/switch-to-configuration: Never stop system.slice"Michael Weiss2019-04-28
* | | | | | | | | | | | | | Merge pull request #59731 from ajs124/ejabberd_testSilvan Mosberger2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | nixos/ejabberd: migrate to tmpfiles, drop runitajs1242019-04-23
| * | | | | | | | | | | | | | nixos/ejabberd: add basic testajs1242019-04-19
| * | | | | | | | | | | | | | xmpp-sendmessage: init script file, use in prosody testajs1242019-04-17
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | sway: Read the configuration from /etc before /nix/store (#60319)Michael Weiss2019-04-27
* | | | | | | | | | | | | | nixos/sks: Fix the module (the pre-start script was broken)Michael Weiss2019-04-27
* | | | | | | | | | | | | | Merge pull request #60197 from etu/patch-gitea-generated-configSarah Brofeldt2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | nixos/gitea: Don't include not needed database options depending on typeElis Hirwing2019-04-25
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #60019 from aanderse/nzbgetFlorian Klink2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nixos/nzbget: fix broken service, add a nixos test, as well as some general i...Aaron Andersen2019-04-25
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #59424 from florianjacob/journalwatchAaron Andersen2019-04-27
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | nixos/journalwatch: permissionsStartOnly is deprecatedFlorian Jacob2019-04-24