nixpkgs

History

Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging.

Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix

2014-09-02 12:31:03 +02:00

2014-09-02 12:31:03 +02:00

2014-07-02 12:28:18 -04:00

2014-09-02 12:31:03 +02:00

Add IDs for uhub service

2014-09-01 10:53:19 +04:00

2014-08-30 10:04:02 +02:00

2014-09-02 00:58:30 +04:00

2014-09-02 00:58:30 +04:00

2014-09-02 10:38:16 +02:00

2014-09-02 02:12:46 +04:00

2014-09-02 00:53:52 +04:00

Fix evaluation

2014-08-06 19:44:13 +02:00

2014-09-02 12:31:03 +02:00

module-list.nix

2014-09-02 01:48:50 +04:00

rename.nix

2014-04-29 19:00:39 +02:00