summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master' into stagingobadz2016-08-27
|\
| * Merge pull request #11484 from oxij/nixos-toposort-filesystemsNikolay Amiantov2016-08-27
| |\
| | * nixos: generalize copy-paste from stage-1 and zfs to utilsJan Malakhovski2016-08-23
| | * nixos: copy resize2fs only for stage-1 fileSystemsJan Malakhovski2016-08-23
| | * nixos: apply toposort to fileSystems to support bind and move mountsJan Malakhovski2016-08-23
| | * nixos: tasks/fileSystems: cleanupJan Malakhovski2016-08-23
| | * Revert a soon to be useless pice of "nixos/stage-1: add mechanism which lustr...Jan Malakhovski2016-08-23
| * | virtualbox-image: use vmdk wrapper instead of vdi copy (avoids 1 disk copy)obadz2016-08-27
| * | virtualbox-image: remove configFile to let clone-config do its job in demoobadz2016-08-27
| * | nixos/doc/gitlab: fix buildFranz Pletz2016-08-26
| * | Merge pull request #17941 from romildo/upd.eflJoachim F2016-08-26
| |\ \
| | * | enlightenment: adapt service for efl-0.18.0José Romildo Malaquias2016-08-23
| | |/
| * | gitlab: 8.10.6 -> 8.11.2Franz Pletz2016-08-26
| * | Merge pull request #17908 from Mic92/fermGraham Christensen2016-08-25
| |\ \
| | * | ferm: init at 2.3Jörg Thalheim2016-08-25
| * | | nginx module: add index and tryFilesRobin Gloster2016-08-25
| * | | nixos/pulseaudio: remove stray load-modulesProfpatsch2016-08-25
| * | | treewide: cups_filters -> cups-filtersBjørn Forsman2016-08-25
| * | | cjdns: fix assertion.Carles Pagès2016-08-25
| * | | nixos/filesystems: update /etc/fstab comment headerBjørn Forsman2016-08-24
| * | | Merge nixpkgs.config.perlPackageOverridesIgor Pashev2016-08-24
| * | | deleted: nixos/modules/virtualisation/qemu-opts (file likely checked in by ac...obadz2016-08-24
| * | | nixos-install: remove manifest related stuffobadz2016-08-24
* | | | Merge remote-tracking branch 'origin/master' into hardened-stdenvFranz Pletz2016-08-24
|\| | |
| * | | ldap: Add option for NSS integrationMarkus Mueller2016-08-23
| * | | ldap: Add option for login PAM integrationMarkus Mueller2016-08-23
| | |/ | |/|
| * | initrd-ssh service: ensure that keys got copied into initrdNikolay Amiantov2016-08-23
| * | Revert "Temporarily disable chromium test"obadz2016-08-23
| * | nix-daemon service: fix unbalanced parens in descriptionJoachim Fasting2016-08-23
| * | Fix virtualbox test evaluationEelco Dolstra2016-08-23
| * | Temporarily disable chromium testEelco Dolstra2016-08-23
| * | glib: Add some FIXMEs about inappropriate outputsTuomas Tynkkynen2016-08-23
| * | treewide: Fix output references to opensslTuomas Tynkkynen2016-08-23
| * | treewide: Fix output references to gnome.GConfTuomas Tynkkynen2016-08-23
| * | graphite service: Use correct output of cairoTuomas Tynkkynen2016-08-23
| * | kde5: colord-kde movedThomas Tuegel2016-08-22
| * | treewide: Use more makeBinPathTuomas Tynkkynen2016-08-23
| * | treewide: Use makeBinPathTuomas Tynkkynen2016-08-23
| * | treewide: Use makeLibraryPath in LD_LIBRARY_PATHsTuomas Tynkkynen2016-08-23
| * | treewide: update cifs-utils attr references (cifs_utils -> cifs-utils)Bjørn Forsman2016-08-22
| * | Merge branch 'master' into stagingobadz2016-08-22
| |\ \
| | * | nixos/stage-1: add mechanism which lustrates all impurities from / (#17784)obadz2016-08-22
| | |/
| | * Merge pull request #17891 from abbradar/hibernation-testDomen Kožar2016-08-21
| | |\
| | | * nixos tests: add hibernation test to blockersNikolay Amiantov2016-08-21
| | * | mattermost: cosmetic: remove stray character (#17897)Ruslan Babayev2016-08-21
| | |/
| * | Merge branch 'master' into stagingobadz2016-08-21
| |\|
| | * nixos: blacklist radeon module if using amdgpuVladimír Čunát2016-08-21
| | * Merge pull request #17469 from ericsagnes/module/hydraDomen Kožar2016-08-20
| | |\
| | | * hydra-module: add default to buildMachinesFilesEric Sagnes2016-08-03
| | | * hydra-module: honor user and group idsEric Sagnes2016-08-03