77da5efc78
Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken) |
||
---|---|---|
.. | ||
all-packages.nix | ||
guile-2-test.nix | ||
haskell-defaults.nix | ||
haskell-packages.nix | ||
make-tarball.nix | ||
node-packages-generated.nix | ||
node-packages.json | ||
node-packages.nix | ||
perl-packages.nix | ||
php-packages.nix | ||
platforms.nix | ||
python-packages-generated.nix | ||
python-packages.json | ||
python-packages.nix | ||
release-cross.nix | ||
release-lib.nix | ||
release-python.nix | ||
release-small.nix | ||
release.nix |