1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-20 12:59:25 +00:00
nixpkgs/pkgs/tools
aszlig c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
..
admin adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00
archivers Update zpaq 2014-03-08 21:13:00 +04:00
audio pa_applet: work around a build problem 2013-12-10 13:41:20 +01:00
backup duplicity: add missing 'lockfile' build input 2014-03-08 13:30:40 +01:00
bluetooth - Add openobex's unusual pkgconfig to pkgconfig path 2014-02-19 18:11:54 +00:00
cd-dvd garden 2014-03-07 17:35:01 +01:00
compression bzip2/cross: Patch out erroneous path separator. 2014-02-24 07:26:23 +01:00
filesystems Update GlusterFS 2014-03-08 21:12:59 +04:00
graphics pstoedit: update from 3.50 to 3.62 2014-03-03 11:10:25 +01:00
inputmethods/fcitx fcitx: update to 4.2.8.3 2013-09-28 19:44:52 +08:00
misc Merge pull request #1837 from falsifian/apt-offline 2014-03-10 21:39:43 +01:00
networking BadVPN moved to GitHub 2014-03-09 03:07:09 +04:00
package-management cabal-install: update to version 1.18.0.3 2014-03-08 11:27:29 +01:00
security Merge pull request #1862 from matejc/fixtorbrowser 2014-03-07 12:59:02 +01:00
system collectd: update from 5.4.0 to 5.4.1 2014-03-08 18:21:06 +02:00
text xmlstarlet: advance version to 1.5.0 2014-02-11 23:17:39 +01:00
typesetting Merge pull request #1869 from lovek323/texlive-full 2014-03-08 08:12:04 +01:00
video mjpegtools: update from 2.0.0 to 2.1.0 2014-02-27 18:45:04 +02:00
virtualization aws: hardcode perl location 2014-02-12 08:27:08 -05:00
X11 adopt rest of the packages that were failing with the buildPythonPackage changes 2014-02-20 01:19:15 +01:00