Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: aa9a04883e34f6a7b89846e87654577d5b218f46
https://github.com/NixOS/nixpkgs/commit/aa9a04883e34f6a7b89846e87654577d5b218f46
Author: Vladimír Čunát <vcu...@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M nixos/lib/testing.nix
M pkgs/applications/graphics/leocad/default.nix
M pkgs/applications/graphics/photivo/default.nix
M pkgs/applications/misc/cli-visualizer/default.nix
M pkgs/applications/misc/termite/default.nix
M pkgs/applications/science/robotics/qgroundcontrol/default.nix
M pkgs/applications/video/simplescreenrecorder/default.nix
M pkgs/applications/virtualization/virtualbox/default.nix
M pkgs/build-support/cc-wrapper/default.nix
M pkgs/build-support/gcc-cross-wrapper/builder.sh
M pkgs/build-support/gcc-cross-wrapper/default.nix
M pkgs/build-support/setup-hooks/make-wrapper.sh
M pkgs/build-support/trivial-builders.nix
M pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
M pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
M pkgs/development/compilers/gcc/4.5/default.nix
M pkgs/development/compilers/gcc/4.6/builder.sh
M pkgs/development/compilers/gcc/4.6/default.nix
M pkgs/development/compilers/gcc/4.8/default.nix
M pkgs/development/compilers/gcc/4.9/default.nix
M pkgs/development/compilers/gcc/5/default.nix
M pkgs/development/compilers/gcc/6/default.nix
M pkgs/development/compilers/gcc/builder.sh
M pkgs/development/libraries/botan/generic.nix
M pkgs/development/libraries/botan/unstable.nix
M pkgs/development/libraries/gettext/default.nix
A pkgs/development/libraries/glibc/builder.sh
M pkgs/development/libraries/glibc/common.nix
M pkgs/development/libraries/glibc/default.nix
R pkgs/development/libraries/glibc/fix_warnings.patch
M pkgs/development/libraries/kerberos/krb5.nix
R pkgs/development/libraries/kerberos/path_char_fix.patch
M pkgs/development/libraries/libelf/default.nix
M pkgs/development/libraries/libxkbcommon/default.nix
M pkgs/development/libraries/xgboost/default.nix
M pkgs/development/python-modules/generic/wrap.sh
M pkgs/development/tools/analysis/rr/default.nix
M pkgs/development/tools/misc/hydra/default.nix
M pkgs/games/cataclysm-dda/default.nix
M pkgs/games/dwarf-fortress/dfhack/default.nix
M pkgs/games/dwarf-fortress/unfuck.nix
M pkgs/games/openspades/default.nix
M pkgs/games/openspades/git.nix
M pkgs/games/the-butterfly-effect/default.nix
M pkgs/misc/emulators/higan/default.nix
M pkgs/misc/emulators/pcsx2/default.nix
M pkgs/os-specific/linux/sysdig/default.nix
M pkgs/servers/nosql/arangodb/default.nix
M pkgs/stdenv/generic/setup.sh
M pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
M pkgs/tools/typesetting/xmlto/default.nix
Log Message:
-----------
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see
https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096
This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing
changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
