Updating from trunk.
Updating from trunk.

I had to fix conflicts in the pcre expression, and as usual, all-packages.nix about stdenv2.



git-svn-id: a429611b7c683173d3306e4578c9e50cf5e23eb3@24153 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb

bnordgren/nixos,bnordgren/nixos,bnordgren/nixos,bnordgren/nixos,bnordgren/nixos