summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-03-01
|\
| * Revert "Add the tool "nixos-typecheck" that can check an option declaration to:"Eelco Dolstra2016-03-01
| * Merge pull request #13522 from Pleune/fix/x11-bspwm-updatejoachifm2016-03-01
| |\
| | * x11 service: bspwm limit sxhkd freqencyMitchell Pleune2016-02-29
| * | Merge pull request #10288 from lethalman/gnomeisoLuca Bruno2016-02-29
| |\ \ | | |/ | |/|
| | * installer: add graphical GNOME isoLuca Bruno2016-02-29
| * | Manual: rl-unstable.xml -> rl-1603.xmlEelco Dolstra2016-02-29
| * | nixos-modules: Fixes related to "literalExample" and "defaultText".Thomas Strobel2016-02-29
| * | Add the tool "nixos-typecheck" that can check an option declaration to:Thomas Strobel2016-02-29
* | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-28
|\| |
| * | Merge pull request #12487 from hrdinka/refactor/nsdFranz Pletz2016-02-28
| |\ \
| | * | nsd service: add build time config validationChristoph Hrdinka2016-02-28
| | * | nsd service: add non-backward compatible release note entryNicolas B. Pierron2016-02-28
| | * | nsd service: make use of literalExampleChristoph Hrdinka2016-02-28
| | * | nsd service: add missing optionsChristoph Hrdinka2016-02-28
| | * | nsd service: code cleanupChristoph Hrdinka2016-02-28
| * | | nixos/collectd: Fix package optionFranz Pletz2016-02-28
| * | | nixos: remove top-level uim optionThomas Tuegel2016-02-28
| * | | fcitx: show available engines in module descriptionThomas Tuegel2016-02-28
| * | | nixos: remove qtPlugins and gtkPluginsThomas Tuegel2016-02-28
| * | | fix NixOS evalDomen Kožar2016-02-28
| * | | nixos copySystemConfiguration: fix when chrootedVladimír Čunát2016-02-28
| * | | note the desktopManagerHandlesLidAndPower removalDomen Kožar2016-02-28
| * | | Merge pull request #9727 from Profpatsch/dm-lid-managementDomen Kožar2016-02-28
| |\ \ \ | | |/ / | |/| |
| | * | Remove desktopManagerHandlesLidAndPowerProfpatsch2015-09-08
| * | | Merge pull request #13524 from makefu/bepasty-recursive-envDomen Kožar2016-02-28
| |\ \ \
| | * | | services.bepasty: buildEnv for creating PYTHONPATHmakefu2016-02-28
| * | | | moodle: 2.8.5 -> 2.8.10 for CVE-2016-0724 CVE-2016-0725Graham Christensen2016-02-27
| |/ / /
| * | | Improve services.locate.period deprecation messageEelco Dolstra2016-02-27
| * | | Revert "Add a way to pin a NixOS version within the module system."Eelco Dolstra2016-02-27
| * | | Merge pull request #8630 from lihop/nixos/fix-formattingDomen Kožar2016-02-27
| |\ \ \
| | * | | nixos/activation-script: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | xserver service: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | phpfpm service: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | fail2ban service: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | nsd service: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | cacert: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | nixos/freetds: fix formatting of exampleLeroy Hopson2016-02-27
| | * | | nixos/vpnc: fix formatting of exampleLeroy Hopson2016-02-27
| * | | | Merge #12796: nixos docs: show references to packagesVladimír Čunát2016-02-27
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | nixos manuals: bring back package referencesVladimír Čunát2016-02-03
| | * | | nixos docs: allow displaying package referencesVladimír Čunát2016-02-03
* | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-27
|\| | | |
| * | | | nixos: libinput use mkEnableOptionRobert Klotzner2016-02-27
| * | | | ibus: add engine list to module descriptionThomas Tuegel2016-02-26
| * | | | ibus: refresh cache at startupThomas Tuegel2016-02-26
| * | | | Merge branch 'ibus'Thomas Tuegel2016-02-26
| |\ \ \ \
| | * | | | ibus: rewrite NixOS moduleThomas Tuegel2016-02-26
* | | | | | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-02-27
|\| | | | |
| * | | | | Merge pull request #13471 from Profpatsch/networkmanager-link-localArseniy Seroka2016-02-27
| |\ \ \ \ \ | | |/ / / / | |/| | | |