summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-16
|\
| * nixos/tests/ecryptfs: placate some commands causing many builds failureobadz2016-08-16
| * Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"Shea Levy2016-08-15
| * Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgsShea Levy2016-08-15
| |\
| | * nixos treewide: don't set MODULE_DIRNikolay Amiantov2016-08-16
| | * modprobe service: drop kmod wrapperNikolay Amiantov2016-08-16
| | * treewide: replace several /sbin paths by /binNikolay Amiantov2016-08-16
| * | nixos/make-disk-image: add ability to defer bootloader install until image ha...obadz2016-08-15
| * | grsecurity docs: mention chromium setuid sandboxJoachim Fasting2016-08-15
| * | grsecurity module: systemd-nspawn requires cap_sys_adminJoachim Fasting2016-08-15
| * | grsecurity module: permit chmod +s in sandboxed buildsJoachim Fasting2016-08-15
| * | grsecurity docs: add note about user namespacesJoachim Fasting2016-08-15
| * | phpfpm: allow old config format as well (#17754)Robin Lambertz2016-08-15
| |/
| * autofs service: make service more like upstream oneNikolay Amiantov2016-08-14
| * networkmanager service: make wanted by network.target, drop networkmanager-initNikolay Amiantov2016-08-14
| * ejabberd service: move service to foregroundNikolay Amiantov2016-08-14
| * crashplan: Wait for filesystems to be mounted before startingSvein Ove Aas2016-08-14
* | Merge branch 'master' into hardened-stdenvFranz Pletz2016-08-13
|\|
| * release-small: drop mysql51, removed in 975d33e6Vladimír Čunát2016-08-13
| * gitlab module: restart services on failureFranz Pletz2016-08-12
| * Remove the Cassandra moduleEelco Dolstra2016-08-12
| * fcitx-unikey: mention in dockbookHoàng Minh Thắng2016-08-12
* | nixos.tests.boot-stage1: disable pic for kernel moduleRobin Gloster2016-08-13
* | Merge remote-tracking branch 'upstream/master' into hardened-stdenvRobin Gloster2016-08-12
|\|
| * gocd-agent / gocd-server: Reduce test memory requirements so Hydra buildsGraham Christensen2016-08-10
| * gocd-agent: 16.7.0 startup fixes + test improvementsGraham Christensen2016-08-10
| * Revert "command-not-found: disable module until it's fixed again"Eelco Dolstra2016-08-10
| * bump gocd-agent version to 16.6.0-3590 (#17311)Shawn Warren2016-08-10
| * further fix manual evaluationobadz2016-08-10
| * fix manual evaluationDomen Kožar2016-08-10
| * Merge pull request #17464 from cransom/cassandraFrederik Rietdijk2016-08-10
| |\
| | * cassandra service: initCasey Ransom2016-08-02
| * | nixos: remove rsync from base install and add explicit path in nixos-installobadz2016-08-09
| * | nixos-install: more robust way of sourcing fresh version of selfobadz2016-08-09
| * | nginx module: fixup events in configRobin Gloster2016-08-09
| * | nixos/tests/installer.nix: add libxml2 & libxslt to prevent download attemptsobadz2016-08-09
| * | Merge branch 'nixpkgs-git-revision-fix'aszlig2016-08-09
| |\ \
| | * | nixos/version: Try to get Git revison from .gitaszlig2016-08-09
| | * | Revert adding .git-revision unconditionallyaszlig2016-08-09
| * | | nginx module: fix cfg.config backwards compatibilityRobin Gloster2016-08-09
| |/ /
| * | nixos/stage-1: use `readlink -e` in builderThomas Tuegel2016-08-08
| * | nixos/stage-1: fix antiquotationThomas Tuegel2016-08-08
| * | libinput.accelProfile: improve docs & new defaultProfpatsch2016-08-08
| * | Merge pull request #17100 from abbradar/resume-delayWout Mertens2016-08-08
| |\ \
| | * | nixos stage-1: wait for devices during resumption attemptNikolay Amiantov2016-08-08
| | * | nixos stage-1: move resumption below helper functions' definitionsNikolay Amiantov2016-08-08
| | * | nixos stage-1: factor device waiting into a functionNikolay Amiantov2016-08-08
| * | | unity3d: use chromium-suid-sandboxNikolay Amiantov2016-08-08
| * | | chromium-suid-sandbox module: fix descriptionNikolay Amiantov2016-08-08
| * | | phpfpm service: restructured pool configurationAl Zohali2016-08-08