nixpkgs/pkgs
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing
changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
..
applications Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
build-support Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
data Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
desktops Merge branch 'master.upstream' into staging.upstream 2015-09-29 15:54:33 -07:00
development Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
games Merge pull request #10081 from fazo96/openmw 2015-09-28 00:27:53 +03:00
misc Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
os-specific Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
servers Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
shells
stdenv Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
test
tools Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00
top-level Revert "Merge pull request #9543 from NixOS/staging.post-15.06" 2015-10-06 15:24:20 +02:00