nixpkgs/pkgs/misc
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
..
busybox Fixing the busybox installation. All symlinks were pointing wrong. 2012-01-01 20:14:50 +00:00
cups svn merge ^/nixpkgs/trunk 2012-01-26 15:27:03 +00:00
drivers * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
emulators svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
foldingathome * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
freestyle
ghostscript ghostscript: cosmetic change to simplify the DLL build and install procedure 2012-01-11 23:14:12 +00:00
gxemul * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
jackaudio * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
lilypond
maven update maven3 2011-05-12 08:39:09 +00:00
my-env * The postHook substitution is not used anywhere, so get rid of it. 2012-01-19 15:39:12 +00:00
rosegarden
sane-backends * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
sane-front
screensavers * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
source-and-tags * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
themes/gtk2/oxygen-gtk Updating oxygen-gtk to 1.1.1 2011-08-06 10:33:52 +00:00
trac
uboot * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
xosd
xsane
misc.nix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00