acd4299e75
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice. |
||
|---|---|---|
| .. | ||
| buildenv | ||
| builder-defs | ||
| cabal | ||
| checker | ||
| clang-wrapper | ||
| dotnetenv | ||
| fetchbzr | ||
| fetchcvs | ||
| fetchdarcs | ||
| fetchfile | ||
| fetchgit | ||
| fetchgitrevision | ||
| fetchhg | ||
| fetchmtn | ||
| fetchsvn | ||
| fetchsvnrevision | ||
| fetchsvnssh | ||
| fetchurl | ||
| gcc-cross-wrapper | ||
| gcc-wrapper | ||
| kernel | ||
| make-desktopitem | ||
| make-startupitem | ||
| make-symlinks | ||
| mono-dll-fixer | ||
| native-darwin-cctools-wrapper | ||
| nuke-references | ||
| release | ||
| setup-hooks | ||
| src-only | ||
| substitute | ||
| upstream-updater | ||
| vm | ||
| vsenv | ||
| replace-dependency.nix | ||
| source-from-head-fun.nix | ||
| trivial-builders.nix | ||