forked from mirrors/nixpkgs
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. |
||
|---|---|---|
| .. | ||
| all-packages.nix | ||
| guile-2-test.nix | ||
| haskell-defaults.nix | ||
| haskell-packages.nix | ||
| make-tarball.nix | ||
| mingw.nix | ||
| node-packages.nix | ||
| perl-packages.nix | ||
| platforms.nix | ||
| python-packages.nix | ||
| release-cross.nix | ||
| release-lib.nix | ||
| release-python.nix | ||
| release-small.nix | ||
| release.nix | ||