summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* 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
| * | | Merge branch 'font-updates' into stagingNikolay Amiantov2016-08-20
| |\ \ \
| | * | | freetype: re-add infinality patchesNikolay Amiantov2016-08-20
| | * | | freetype: 2.6.2 -> 2.6.5cmfwyp2016-08-20
| | * | | fontconfig-ultimate: 2015-12-06 -> 2016-04-23Nikolay Amiantov2016-08-20
| | * | | fontconfig module: respect upstream definitionsEric Sagnes2016-08-20
| | * | | fontconfig: fix etc priorityEric Sagnes2016-08-20
| * | | | Merge #17852: gtk3: 3.20.8 -> 3.20.9Vladimír Čunát2016-08-20
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | nixos/shadow: setuid wrappers for new{uid,gid}mapBenno Fünfstück2016-08-19
| * | | nixos treewide: don't set MODULE_DIRNikolay Amiantov2016-08-19
| * | | modprobe service: drop kmod wrapperNikolay Amiantov2016-08-19
| * | | treewide: replace several /sbin paths by /binNikolay Amiantov2016-08-19
| |/ /
| * | Merge pull request #17803 from mfine/mfine-always-write-ssh-keysJoachim F2016-08-19
| |\ \
| | * | buildkite-agent: always write out the ssh keys.Mark Fine2016-08-17
| * | | zfs: print the output of the zpool command (if any) when it succeedsRicardo M. Correia2016-08-18
| * | | Merge pull request #16901 from Baughn/zfs-nvme-fixRicardo M. Correia2016-08-18
| |\ \ \
| | * | | zfs: Keep trying root import until it worksSvein Ove Aas2016-08-16
| * | | | services/graphite: Fix paths to some Python packages.Corbin2016-08-17
| * | | | Merge branch 'install-bootloader-flag'Shea Levy2016-08-17
| |\ \ \ \
| | * | | | Deprecate --install-grub in favor of --install-bootloader for nixos-rebuild.Shea Levy2016-08-16
| * | | | | Merge pull request #16762 from matthewbauer/gnustep2Joachim F2016-08-17
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | gnustep: fix gdomap serviceMatthew Bauer2016-08-16
| | * | | | gnustep: remove gdnc serviceMatthew Bauer2016-08-16
| | * | | | gnustep: fix naming of gnustep stuffMatthew Bauer2016-08-16