summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'up' into hardened-stdenvRobin Gloster2016-02-20
|\
| * Merge pull request #10231 from zimbatm/apache-intermediate-sslzimbatm2016-02-20
| |\
| | * apache-httpd: harden default SSL cipher listzimbatm2015-10-05
| * | wpa_supplicant module: after network-interfaces.targetRobin Gloster2016-02-20
| * | Merge pull request #13142 from zimbatm/zerotierone-1.1.4Arseniy Seroka2016-02-20
| |\ \
| | * | zerotierone: adopt systemd unit from upstreamzimbatm2016-02-19
* | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-19
|\| | |
| * | | kde5: reduce default installation sizeThomas Tuegel2016-02-19
| * | | Merge pull request #13069 from abbradar/m3dNikolay Amiantov2016-02-19
| |\ \ \
| | * | | octoprint service: initNikolay Amiantov2016-02-17
| * | | | nixos/collectd: add defaultText to package optionBjørn Forsman2016-02-18
| * | | | tlsdated: add missing default value for extraOptionstg(x)2016-02-18
| * | | | collectd service: Add option packageFranz Pletz2016-02-18
| * | | | nixos: Provide a defaultText for type = packageaszlig2016-02-17
| |/ / /
| * | | Fix azure image, by adding subformat=fixed to disk generation.Rob Vermaas2016-02-17
| * | | Merge branch 'master' into stagingVladimír Čunát2016-02-17
| |\ \ \
| | * \ \ Merge branch 'pdnsd-service' of https://github.com/nfjinjing/nixpkgsNikolay Amiantov2016-02-16
| | |\ \ \
| | | * | | pdnsd service: initJinjing Wang2016-02-12
| | * | | | Merge branch 'gammu-smsd' of https://github.com/zohl/nixpkgs into zohl-gammu-...Nikolay Amiantov2016-02-16
| | |\ \ \ \
| | | * | | | gammu-smsd service: initAl Zohali2016-02-15
| | * | | | | Merge pull request #13000 from mayflower/feat/unbound-dnssecFranz Pletz2016-02-16
| | |\ \ \ \ \
| | | * | | | | unbound service: add fetching root anchor for DNSSECFranz Pletz2016-02-15
| | | * | | | | unbound service: add types to optionsFranz Pletz2016-02-15
| | | * | | | | unbound service: retabFranz Pletz2016-02-15
| | * | | | | | Merge pull request #12988 from colemickens/cfdyndnsArseniy Seroka2016-02-16
| | |\ \ \ \ \ \
| | | * | | | | | cfdyndns: init at 0.0.1Cole Mickens2016-02-15
| | * | | | | | | Merge pull request #12992 from lukasepple/masterArseniy Seroka2016-02-15
| | |\ \ \ \ \ \ \
| | | * | | | | | | intel2200BGFirmware: init at 3.1lukasepple2016-02-15
| | | | |/ / / / / | | | |/| | | | |
| * | | | | | | | Merge branch 'master' into stagingVladimír Čunát2016-02-07
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Configure a default trust store for opensslGuillaume Maudoux2016-02-03
| * | | | | | | | | Merge branch 'fontconfig-caches' into stagingNikolay Amiantov2016-02-01
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fontconfig service: add pre-generated fonts cachesNikolay Amiantov2016-01-29
| * | | | | | | | | | Merge branch 'master' into stagingVladimír Čunát2016-01-29
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | nixos xserver: remove vaapiDriversNikolay Amiantov2016-01-26
| * | | | | | | | | | | nixos opengl: add extraPackages and extraPackages32Nikolay Amiantov2016-01-26
| * | | | | | | | | | | Merge branch 'master' into stagingVladimír Čunát2016-01-25
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #12368 from abbradar/ghostscript-updateNikolay Amiantov2016-01-22
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | nixos changelog: mention CUPS changesNikolay Amiantov2016-01-21
| | * | | | | | | | | | | | cupsd service: move root directory to /var/lib/cupsNikolay Amiantov2016-01-17
| | * | | | | | | | | | | | cupsd service: don't allow overriding necessary configuration optionsNikolay Amiantov2016-01-17
| | * | | | | | | | | | | | cupsd service: add gutenprint supportNikolay Amiantov2016-01-17
| | * | | | | | | | | | | | cupsd service: move all default drivers to the bindir directlyNikolay Amiantov2016-01-17
| | * | | | | | | | | | | | cupsd service: use cups-pk-helper is policykit is enabledNikolay Amiantov2016-01-17
* | | | | | | | | | | | | | Merge branch 'master' into hardened-stdenvFranz Pletz2016-02-15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #12742 from dezgeg/pr-uboot-changesTuomas Tynkkynen2016-02-15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | sd-image.nix: Move the /boot partition up to 8MTuomas Tynkkynen2016-02-01
| | * | | | | | | | | | | | sd-image-armv7l-multiplatform.nix: Add ttymxc0 to the list of consolesTuomas Tynkkynen2016-02-01
| * | | | | | | | | | | | | dspam service: restrict socket accessNikolay Amiantov2016-02-14
| * | | | | | | | | | | | | dspam service: set ClientHostNikolay Amiantov2016-02-14
| * | | | | | | | | | | | | Merge pull request #9913 from chris-martin/synaptics-optionsFranz Pletz2016-02-14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |