9ee0a9df9b
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434 |
||
---|---|---|
.. | ||
gnu | ||
copy-tarballs.sh | ||
debian-patches.sh | ||
dep-licenses.sh | ||
eval-release.nix | ||
gnome-latest.sh | ||
hydra_eval_check | ||
map-files.pl | ||
nix-call-package | ||
patchelf-hints.sh | ||
rebuild-amount.sh | ||
sort-attrs.str | ||
test-eval-release.sh |