Commit Graph

6 Commits

Author SHA1 Message Date
Eelco Dolstra
4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
Vladimír Čunát
aaaa9f0041 lame: fix build on 32-bit with gcc 4.9 2015-06-04 16:13:06 +02:00
Eelco Dolstra
5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
William A. Kennington III
3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups
Mostly scripted substitutions with a couple of subjective enhancements.
2015-04-30 18:17:42 +02:00
codyopel
b03ded550f lame: move to libraries & fix license 2015-02-14 19:06:38 -05:00