about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* google-compute-image: make it a module and the size tuneable (#49854)Ding Xiang Fei2018-11-26
* Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closur...Ding Xiang Fei2018-11-26
|\
| * Merge pull request #51012 from griff/rspamd-proxy-typeSilvan Mosberger2018-11-25
| |\
| | * nixos/rspamd: Allow worker type to be proxy againBrian Olsen2018-11-25
| * | Merge pull request #51001 from c0bw3b/cleanup/more-httpsRenaud2018-11-25
| |\ \
| | * | nixos/mediawiki: fetch over httpsc0bw3b2018-11-24
| | * | nixos/flashpolicyd: fix url and use httpsc0bw3b2018-11-24
| | * | nixos/systemhealth: fix url and use httpsc0bw3b2018-11-24
| | * | nixos/hpsa: use httpsc0bw3b2018-11-24
| | |/
| * | Merge pull request #50469 from mguentner/mxisdFranz Pletz2018-11-25
| |\ \
| | * | modules: add mxisd with testMaximilian Güntner2018-11-25
| * | | treewide: systemd timeout arguments to use infinity instead of 0 (#50934)Craig Younkins2018-11-25
| | |/ | |/|
| * | nixos/hardened: restrict access to nix daemonJoachim Fasting2018-11-24
| * | nixos/tests/hardened: fix build by disabling nix.useSandboxJoachim Fasting2018-11-24
| * | Merge pull request #50950 from jonasnick/nixos-tor-hiddenservice-versionJoachim F2018-11-24
| |\ \
| | * | nixos/tor: add HiddenServiceVersion optionJonas Nick2018-11-23
| * | | Merge pull request #49228 from Ekleog/rss2email-moduleMichael Raskin2018-11-23
| |\ \ \
| | * | | rss2email module: initLéo Gaspard2018-11-15
| * | | | nixos/prometheus: require one alertmanager configuration parameterAndreas Rammhold2018-11-23
| * | | | nixos/prometheus: check alertmanager configurationAndreas Rammhold2018-11-23
| * | | | nixos/prometheus: add `package` option to alertmanagerAndreas Rammhold2018-11-23
| * | | | Merge pull request #50948 from Ma27/fix-nixos-build-vms-evalFranz Pletz2018-11-23
| |\ \ \ \
| | * | | | nixos-build-vms: fix evalMaximilian Bosch2018-11-23
| * | | | | Merge pull request #50641 from blaxill/firewallMergeJörg Thalheim2018-11-23
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Rename back to default and better release notesBen Blaxill2018-11-22
| | * | | | Add release notesBen Blaxill2018-11-21
| | * | | | Refactor out the set operationsBen Blaxill2018-11-20
| | * | | | nixos/firewall: Always use global firewall.allowed rulesBen Blaxill2018-11-18
| * | | | | mininet: init at 2.3.0d4 (#41261)Matthieu Coudron2018-11-21
| * | | | | netdata: create missing /etc/netdataJörg Thalheim2018-11-21
| * | | | | Merge pull request #41887 from gmarmstrong/fix/seahorse-updateMatthew Bauer2018-11-21
| |\ \ \ \ \
| | * | | | | nixos/seahorse: require gnome3.dconfgmarmstrong2018-06-12
| * | | | | | Revert "resolvconf.conf: Remove forced NSCD service restart"Eelco Dolstra2018-11-21
| * | | | | | Merge pull request #48772 from hhomar/gnupg-tty-fixJörg Thalheim2018-11-21
| |\ \ \ \ \ \
| | * | | | | | gnupg: Fix, set current tty in interactive shellHeitham Omar2018-10-21
| * | | | | | | Merge pull request #50472 from jfrankenau/fix-penultimateThomas Tuegel2018-11-20
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/fontconfig: fix enable option of penultimateJohannes Frankenau2018-11-16
| * | | | | | | | Fix release notes XML para closing tagCraig Younkins2018-11-20
| * | | | | | | | Merge master into staging-nextFrederik Rietdijk2018-11-20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | nixos.tests.keymap: use new name of the colemak/en-latin9 keymapPierre Bourdon2018-11-20
| | * | | | | | | | Merge pull request #50499 from delroth/syncthing-relaySamuel Dionne-Riel2018-11-20
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | syncthing-relay module: initPierre Bourdon2018-11-19
| | * | | | | | | | | Merge pull request #49735 from pvgoran/mysql-support-mysql57Linus Heckemann2018-11-19
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | nixos/mysql: support package=mysql57Pavel Goran2018-11-18
| * | | | | | | | | | Merge master into staging-nextFrederik Rietdijk2018-11-19
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #49631 from janikrabe/masterRenaud2018-11-19
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | oidentd: 2.2.2 -> 2.3.1Janik Rabe2018-11-07
| | * | | | | | | | | | nixos/accountsservice: set XDG_DATA_DIRS correctlyBenno Fünfstück2018-11-18
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge master into staging-nextFrederik Rietdijk2018-11-18
| |\| | | | | | | | |
| | * | | | | | | | | Merge pull request #50526 from symphorien/short-test-nameJörg Thalheim2018-11-17
| | |\ \ \ \ \ \ \ \ \