summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge master into stagingFrederik Rietdijk2018-07-13
|\
| * httpd: Fix typoSilvan Mosberger2018-07-13
| * raspberrypiWirelessFirmware: initBen Wolsieffer2018-07-12
| * sdImage: make partition ID/UUID configurableAndrew Dunham2018-07-12
| * nixos: remove option services.xserver.desktopManager.xfce.screenLockvolth2018-07-12
| * nixos/tests/letsencrypt: Hardcode certs and keysaszlig2018-07-12
| * nixos/tests/letsencrypt: Fix go source installaszlig2018-07-12
| * nixos/virtualbox: Adds more options to virtualbox-image.nix (#42699)Dave Laing2018-07-11
| * nixos/bamf: initJan Tojnar2018-07-11
| * nixos/tests/taskserver: fix typos (#43284)Oliver Evans2018-07-11
| * nixos/tests/taskserver: fix evalUli Baum2018-07-11
* | Merge master into stagingFrederik Rietdijk2018-07-10
|\|
| * nixos/udisks2: use upstream unitJan Tojnar2018-07-10
| * Merge pull request #38324 from rvl/znc-uri-prefixxeji2018-07-10
| |\
| | * znc: add uriPrefix optionRodney Lorrimar2018-04-02
| * | options.i18n.inputMethod.package: fix type (#43239)volth2018-07-09
* | | Merge remote-tracking branch 'upstream/master' into stagingMatthew Bauer2018-07-09
|\| |
| * | nixos/nexus: fix evaluationvolth2018-07-09
| * | nixos/matomo: fix evaluationvolth2018-07-09
| * | nixos/journalwatch: fix evaluationvolth2018-07-09
| * | nixos/digitalbitbox: fix evaluationvolth2018-07-09
| * | nixos: Add option networking.networkmanager.dynamicHostsRickard Nilsson2018-07-07
| * | Merge pull request #43094 from grahamc/fix-quagga-docsGraham Christensen2018-07-06
| |\ \
| | * | quagga module: Use a deep merge via imports instead of the shallow mergeGraham Christensen2018-07-05
| * | | networking: Fix timeout when `lo` has aliased IPsGraham Christensen2018-07-06
| * | | nixos.tests.containers-imperative: increase VM memoryVladimír Čunát2018-07-06
| * | | dockerTools.buildImage: add option to use nix output hash as tagMathias Schreck2018-07-06
| * | | Merge pull request #43097 from peterhoeg/m/pipewirePeter Hoeg2018-07-06
| |\ \ \
| | * | | pipewire (nixos): add support for socket activationPeter Hoeg2018-07-06
| * | | | Merge pull request #42569 from spacefrogg/nscd-fixMatthew Bauer2018-07-05
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | resolvconf.conf: Remove forced NSCD service restartMichael Raitza2018-06-25
| * | | | Merge pull request #42724 from yshui/libinput-buttonMatthew Bauer2018-07-05
| |\ \ \ \
| | * | | | nixos/libinput: add button to scrollMethodYuxuan Shui2018-06-28
| * | | | | Merge pull request #42775 from mkaito/oauth2_proxy-virtualHostsYegor Timoshenko2018-07-05
| |\ \ \ \ \
| | * | | | | fixup! oauth2_proxy: add nginx vhost moduleMichishige Kaito2018-06-29
| | * | | | | oauth2_proxy: add nginx vhost moduleMichishige Kaito2018-06-29
| * | | | | | Merge pull request #42398 from Ma27/make-autorandr-target-configurableSilvan Mosberger2018-07-05
| |\ \ \ \ \ \
| | * | | | | | nixos/autorandr: make default target in systemd service configurableMaximilian Bosch2018-07-05
| * | | | | | | Merge pull request #42118 from emmanuelrosa/mpd-nixos-testsSilvan Mosberger2018-07-04
| |\ \ \ \ \ \ \
| | * | | | | | | mpd: add NixOS testsEmmanuel Rosa2018-06-19
| * | | | | | | | supplicant: Fix tiny typo in the documentationIngo Blechschmidt2018-07-04
* | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \