mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 23:20:55 +00:00
5417c720fd
I tried to fix some trivial conflicts. I don't know if I merged well some more difficult conflicts on openssl/darwin_patch or haskell-platform. svn path=/nixpkgs/branches/stdenv-updates/; revision=22878 |
||
---|---|---|
.. | ||
gnu | ||
copy-tarballs.sh | ||
dep-licenses.sh | ||
eval-release.nix | ||
map-files.pl | ||
patchelf-hints.sh | ||
rebuild-amount.sh | ||
sort-attrs.str |