9183f21f7e
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages. Also a small conflict in all-packages about making openssl overridable. And I some linux 2.6.31-zen kernel files also marked in conflict. svn path=/nixpkgs/branches/stdenv-updates/; revision=19438 |
||
|---|---|---|
| .. | ||
| autojump | ||
| bc | ||
| bfr | ||
| bogofilter | ||
| coreutils | ||
| coreutils-5 | ||
| debootstrap | ||
| desktop-file-utils | ||
| eProver | ||
| ethtool | ||
| expect | ||
| fdupes | ||
| figlet | ||
| file | ||
| findutils | ||
| findutils-wrapper | ||
| fontforge | ||
| getopt | ||
| gnokii | ||
| gnuvd | ||
| gparted | ||
| grub | ||
| hddtemp | ||
| idutils | ||
| jdiskreport | ||
| kermit | ||
| keychain | ||
| less | ||
| man | ||
| man-db | ||
| mc | ||
| mcrl | ||
| mcrl2 | ||
| mdbtools | ||
| memtest86 | ||
| minicom | ||
| mssys | ||
| myhasktags | ||
| mysql2pgsql | ||
| parted | ||
| partition-manager | ||
| pg_top | ||
| pinentry | ||
| proxytunnel | ||
| psmisc | ||
| pv | ||
| remind | ||
| rlwrap | ||
| rrdtool | ||
| screen | ||
| shebangfix | ||
| slsnif | ||
| su | ||
| syslog-ng | ||
| system-config-printer | ||
| testdisk | ||
| time | ||
| timidity | ||
| ttf2pt1 | ||
| ttmkfdir | ||
| units | ||
| uucp | ||
| wv | ||
| wv2 | ||
| xclip | ||
| xmltv | ||
| xsel | ||