summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge pull request #43088 from matthewbauer/miscMatthew Bauer2018-07-05
|\
| * Merge pull request #42860 from ldesgoui/fix-murmur-serviceSilvan Mosberger2018-07-03
| |\
| | * murmur: prevent silent launch failureldesgoui2018-07-02
| * | Merge pull request #41222 from gnidorah/firewallSilvan Mosberger2018-07-03
| |\ \
| | * | nixos/firewall: per-interface port optionsgnidorah2018-06-24
| * | | Merge pull request #42896 from sorki/gpsd_nowaitJörg Thalheim2018-07-03
| |\ \ \
| | * | | gpsd: use optionalStringJörg Thalheim2018-07-03
| | * | | nixos/gpsd-service: add services.gpsd.nowait optionRichard Marko2018-07-03
| * | | | Merge pull request #42898 from aespinosa/kerberosJörg Thalheim2018-07-03
| |\ \ \ \
| | * | | | nixos/kerberos: update binary folder pointerAllan Espinosa2018-07-02
| * | | | | Merge pull request #42269 from Baughn/zfsJörg Thalheim2018-07-03
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | zfs: Improve import handlingSvein Ove Aas2018-07-02
| * | | | | Merge pull request #42845 from ivanbrennan/nixos-sudo-describe-rules-precedenceJoachim F2018-07-02
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | nixos/security.sudo: describe extraRules orderivanbrennan2018-07-01
* | | | | | Merge pull request #42887 from matthewbauer/libsecurity-closure-reductionsMatthew Bauer2018-07-02
|\| | | | |
| * | | | | nixos/hadoop: Replace users.extra{Users,Groups}aszlig2018-07-02
| * | | | | Merge pull request #41823 from Chiiruno/dev/megucaJörg Thalheim2018-07-02
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | meguca: 2018-05-26 -> 2018-06-10Okina Matara2018-06-29
| * | | | | Merge pull request #42798 from flokli/users-usersMichael Raskin2018-07-02
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | nixos/modules: users.(extraUsers|extraGroup->users|group)Florian Klink2018-06-30
| | * | | | nixos/tests: users.(extraUsers|extraGroup->users|group)Florian Klink2018-06-30
| | * | | | nixos-generate-config.pl: users.extraUsers-> users.usersFlorian Klink2018-06-30
| | * | | | nixos/modules/installer: users.extraUsers -> users.usersFlorian Klink2018-06-30
* | | | | | Merge branch 'master' into stagingVladimír Čunát2018-07-02
|\| | | | |
| * | | | | iwd: set statedir to /var/lib/iwdJörg Thalheim2018-07-01
| * | | | | Merge pull request #41381 from aespinosa/hadoop-modulesMatthew Bauer2018-06-30
| |\ \ \ \ \
| | * | | | | nixos/hadoop: add hadoop module (hdfs, yarn)Allan Espinosa2018-06-29
| * | | | | | nixos/tests/letsencrypt: Don't substitute certsaszlig2018-06-30
| * | | | | | nixos/fwupd: Fix metaSilvan Mosberger2018-06-30
| * | | | | | Merge pull request #42709 from jollheef/masteradisbladis2018-06-30
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | hostapd: use WPA2 instead of WPA1 by defaultMikhail Klementev2018-06-30
| * | | | | | Merge pull request #42746 from flokli/manual-fixes-users-usersxeji2018-06-30
| |\ \ \ \ \ \
| | * | | | | | manual: rename user added to networkmanager from "youruser" to "alice"Florian Klink2018-06-28
| | * | | | | | manual: rename users.extraUsers to users.usersFlorian Klink2018-06-28
| * | | | | | | openafs_1_8: init at 1.8.0 (#41889)spacefrogg2018-06-30
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'master' into stagingVladimír Čunát2018-06-30
|\| | | | | |
| * | | | | | networkmanager: Expand dns description, integrate with other services (#41898)Benjamin Staffin2018-06-29
| * | | | | | Merge pull request #42655 from yesbox/zerotier_moduleMatthew Bauer2018-06-28
| |\ \ \ \ \ \
| | * | | | | | zerotier: interface names changed; fix no dhcpJesper Geertsen Jonsson2018-06-27
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #42326 from Ekleog/opensmtpd-testMatthew Bauer2018-06-28
| |\ \ \ \ \ \
| | * | | | | | opensmtpd package and module: add nixos testLéo Gaspard2018-06-21
| * | | | | | | Merge pull request #41635 from spacefrogg/dbus-nss-fixMatthew Bauer2018-06-28
| |\ \ \ \ \ \ \
| | * | | | | | | dbus: Add NSS modules path to dbus system bus serviceMichael Raitza2018-06-07
| * | | | | | | | Merge pull request #41799 from pacien/patch-4Matthew Bauer2018-06-28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | cgit: parametrise subdirectoryNotkea2018-06-13
| * | | | | | | | | Merge pull request #42394 from netixx/add-freeradius-modulesMatthew Bauer2018-06-28
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | freeradius : added service to module-listNetix (Espinet François)2018-06-22
| * | | | | | | | | | Merge pull request #41343 from jerith666/restic-s3Matthew Bauer2018-06-28
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | restic: add s3CredentialsFile optionMatt McHenry2018-06-02
| * | | | | | | | | | | Merge pull request #41430 from Tomahna/bloopMatthew Bauer2018-06-28
| |\ \ \ \ \ \ \ \ \ \ \