nixpkgs/pkgs/misc
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
busybox Fixing the busybox installation. All symlinks were pointing wrong. 2012-01-01 20:14:50 +00:00
cups cups: updated to version 1.5.0 2011-10-06 09:57:32 +00:00
drivers State qt version (3/4) in packages, not in all-packages.nix 2012-01-07 17:06:49 +00:00
emulators Update Wine 2011-11-10 04:31:52 +00:00
foldingathome
freestyle
ghostscript Cause ghostscript to build libgs. 2012-01-04 00:26:48 +00:00
gxemul
jackaudio Replacing JACK1 with JACK2 (also jackdbus instead of jackd), this works much better for me 2011-05-09 20:49:51 +00:00
lilypond Update Lilypond - this also fixes its build 2011-01-12 18:19:43 +00:00
maven update maven3 2011-05-12 08:39:09 +00:00
my-env Adding a key 'exit 0' to myenv. Otherwise it fails to build if pkgconfig is one of the build inputs. 2011-03-27 14:08:13 +00:00
rosegarden Adding Rosegarden music editor; builds succesfully, starts, but frequently segfaults. I temporarily give up 2011-01-12 19:01:26 +00:00
sane-backends Rebuild-checked: does not break boot 2011-12-10 05:05:15 +00:00
sane-front
screensavers misc/screensavers/slock: New nixpkg. 2011-09-17 17:40:07 +00:00
source-and-tags
tex * DBLaTeX updated to 0.3.2. 2011-11-22 12:59:22 +00:00
themes/gtk2/oxygen-gtk Updating oxygen-gtk to 1.1.1 2011-08-06 10:33:52 +00:00
trac
uboot svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
xosd
xsane
misc.nix * Remove the NIX_STRIP_DEBUG flag. It was undocumented and confusing 2011-12-12 14:02:12 +00:00