Commit graph

5 commits

Author SHA1 Message Date
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Renzo Carbonara 4902ec1c78 nvidiabl: fix for kernel >= 4 (close #10174) 2015-10-02 12:31:37 +02:00
Yorick van Pelt a2dc00c177 nvidiabl: fix for other kernel versions than current
It was using the version of currently *running* kernel (impurely).
Close #6869.
2015-03-18 10:48:45 +01:00
Rob Vermaas 7047235acb Now properly add nvidiabl. 2014-03-07 16:08:38 +01:00