forked from mirrors/nixpkgs
1abdc56a12
There were conflicting patches of pkgs/os-specific/linux/module-init-tools. Apparently, the expression was updated independently in both branches. I've resolved the conflict by preferring the patches from stdenv-updates, because those patches appeared to be more sophisticated, i.e. they build the manual, etc. svn path=/nixpkgs/branches/stdenv-updates/; revision=29680 |
||
---|---|---|
.. | ||
busybox | ||
cups | ||
drivers | ||
emulators | ||
foldingathome | ||
freestyle | ||
ghostscript | ||
gxemul | ||
jackaudio | ||
lilypond | ||
maven | ||
my-env | ||
rosegarden | ||
sane-backends | ||
sane-front | ||
screensavers | ||
source-and-tags | ||
tex | ||
themes/gtk2/oxygen-gtk | ||
trac | ||
uboot | ||
xosd | ||
xsane | ||
misc.nix |