about summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-07-28
|\
| * Merge pull request #3369 from matejc/fixcpufreqmoduleJaka Hudoklin2014-07-26
| |\
| | * fix e18 cpufreq module: set setuid to freqsetMatej Cotman2014-07-25
| * | RabbitMQ service: add properties essential for clustersEvgeny Egorochkin2014-07-26
| * | Merge pull request #3262 from bjornfor/znc-module-typeslethalman2014-07-26
| |\ \
| | * | nixos/znc-service: don't use types.string (it's deprecated)Bjørn Forsman2014-07-13
| * | | Merge pull request #3292 from offlinehacker/elasticsearch_pluginsJaka Hudoklin2014-07-26
| |\ \ \
| | * | | elasticsearch: add support for pluginsJaka Hudoklin2014-07-25
| * | | | nixos/munin: change activationScript to preStart scriptBjørn Forsman2014-07-26
| |/ / /
| * | | setup-etc.pl: Keep track of copied filesEelco Dolstra2014-07-25
| * | | nix-ssh: Don't use a shell that refers to a store pathEelco Dolstra2014-07-25
| * | | Add convenience option nix.sshServe.keysEelco Dolstra2014-07-25
| * | | nix-ssh-serve.nix: Remove unnecessary checkEelco Dolstra2014-07-25
| | |/ | |/|
| * | nixos/lighttpd: improve sub-service option types (cgit, gitweb)Bjørn Forsman2014-07-23
| * | nixos/lighttpd-service: don't use types.string (it's deprecated)Bjørn Forsman2014-07-23
| * | nixos/doc/manual: Fix typos in README.aszlig2014-07-23
| * | Merge pull request #3335 from DamienCassou/doc-for-building-the-nixos-manualRob Vermaas2014-07-23
| |\ \
| | * | README for building the nixos manualDamien Cassou2014-07-21
* | | | Merge branch 'x-updates' into stagingVladimír Čunát2014-07-22
|\ \ \ \
| * | | | Revert "Merge #3054: add kde 4.13.2"Vladimír Čunát2014-07-22
| * | | | Merge recent master into x-updatesVladimír Čunát2014-07-21
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge recent master into x-updatesVladimír Čunát2014-07-17
| |\ \ \ \
| * \ \ \ \ Merge recent master into x-updatesVladimír Čunát2014-07-09
| |\ \ \ \ \
| * \ \ \ \ \ Merge master into x-updatesVladimír Čunát2014-07-02
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge #3054: add kde 4.13.2Vladimír Čunát2014-06-30
| |\ \ \ \ \ \ \
| | * | | | | | | kde: Allow kde_next as a desktop environmentWout Mertens2014-06-22
* | | | | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-07-22
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge pull request #3336 from DamienCassou/installing-on-efilethalman2014-07-22
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Adding a missing instruction for EFI installationsDamien Cassou2014-07-21
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #3323 from wjlroe/logstash-1.4.2Pascal Wittmann2014-07-21
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix service to use logstash new directory layoutWilliam Roe2014-07-21
| * | | | | | | | Google Compute config: add a unit to wait for the metadata server to become a...Evgeny Egorochkin2014-07-20
| * | | | | | | | e18: enlightenment desktop manager version 18Matej Cotman2014-07-17
| * | | | | | | | Don't restart systemd-journal-flushEelco Dolstra2014-07-17
| | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | nixos/module-list.nix: keep it sortedBjørn Forsman2014-07-16
| * | | | | | | Merge pull request #3285 from ehmry/polipoPeter Simons2014-07-16
| |\ \ \ \ \ \ \
| | * | | | | | | polipo: new service expressionEmery Hemingway2014-07-16
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix virtualbox image building with new nixShea Levy2014-07-15
| * | | | | | | nixos/redis: fix evaluationBjørn Forsman2014-07-15
| * | | | | | | nixos/redis: clean up option typesBjørn Forsman2014-07-15
| * | | | | | | Add automatic plugin activation for vimPaul Colomiets2014-07-15
| |/ / / / / /
* | | | | | | Merge remote-tracking branch 'origin/master' into stagingEelco Dolstra2014-07-14
|\| | | | | |
| * | | | | | Merge pull request #3245 from rastus-vernon/patch-1Pascal Wittmann2014-07-12
| |\ \ \ \ \ \
| | * | | | | | Fix repeated typoRastus Vernon2014-07-11
| * | | | | | | Google Compute Image: fetch host keys if possibleEvgeny Egorochkin2014-07-12
| * | | | | | | Google Compute Image needs the interface to be named eth0 for google tools to...Evgeny Egorochkin2014-07-12
| |/ / / / / /
| * / / / / / Don't restart systemd-remount-fsEelco Dolstra2014-07-11
| |/ / / / /
| * | | | | Fix info commandEelco Dolstra2014-07-08
| * | | | | nixos: add 'firebird' groupMarc Weber2014-07-08
| * | | | | mediawiki: add patch for fixing postgresql errorsSönke Hahn2014-07-07