philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs/tools
History
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
admin svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
archivers svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
backup duplicity: updated to version 0.6.17 2012-02-06 19:45:18 +00:00
bluetooth
cd-dvd * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
compression * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
filesystems * Fix the squashfs build (it links against xz, so xz has 2012-01-20 17:43:50 +00:00
graphics svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
misc svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
networking svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
package-management svn merge ^/nixpkgs/trunk 2012-01-27 16:43:39 +00:00
security Revert "sudo upgrade to 1.8.3p2 (security fix included)" 2012-01-31 14:09:54 +00:00
system svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
text svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
typesetting svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
video Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository. 2011-09-25 09:04:24 +00:00
virtualization * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
X11 svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00