Commit graph

4 commits

Author SHA1 Message Date
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request 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 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
Arnold Krille
3bce303e05 jackmix: Build jackmix in two flavours
Flavours are:
- *jackmix* using jack2 (default)
- *jackmix_jack1* using jack1
2015-10-02 15:42:00 +02:00
Arnold Krille
bb7eb9829d jackmix: init at version 0.5.2
Add jackmix to the nix pkgs.
2015-10-02 14:56:59 +02:00