| Commit message (Collapse) | Author | Age |
|\
| |
| |
| |
| | |
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| | |
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
pkgs/tools/networking/ppp/default.nix
|
| | | |
|
| | | |
|
| |/
| |
| |
| |
| |
| |
| | |
Fixes CVE-2014-3158.
Also remove postPatch and postInstall that don't seem to be needed (any
more?).
|
| |
| |
| |
| |
| | |
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
|
|/ |
|
|
|
|
|
| |
networkmanager requires pppd to have ipv6 support for managing mobile
connections since version 0.9.5.95, ref. to commit 7575f4d.
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=31295
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=31279
|
|
|
|
|
|
|
|
| |
getAttr was ambiguous. It's also a builtin function
fix
svn path=/nixpkgs/trunk/; revision=15692
|
|
|
|
| |
svn path=/nixpkgs/trunk/; revision=15662
|
|
situations. Not tested for trivial reasons, but built OK
svn path=/nixpkgs/trunk/; revision=13925
|