3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/tools/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
..
autojump * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
aws-mturk-clt * Added aws-mturk-clt, the Amazon Mechanical Turk command-line tools. 2011-08-04 12:13:53 +00:00
bc Apply patch taken from http://www.linuxfromscratch.org/blfs/view/svn/general/bc.html 2011-01-06 03:11:25 +00:00
bfr
bogofilter
convmv do not build convmv on darwin 2011-01-05 10:07:42 +00:00
coreutils * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
coreutils-5
cowsay add meta attribute for cowsay 2012-01-31 06:59:02 +00:00
cunit cunit: Add meta information 2011-09-07 03:45:51 +00:00
debootstrap * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
desktop-file-utils
detox
disper add disper 2011-10-14 18:04:34 +00:00
dmg2img * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
dtach * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
ethtool
expect svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
fdupes * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
figlet * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
file * file updated to 5.04. 2010-12-30 18:31:27 +00:00
fileschanged fileschanged: Assorted nitpicks. 2010-11-04 14:26:19 +00:00
findutils
fontforge A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build 2012-02-06 05:49:27 +00:00
getopt
gnokii gnokii-0.6.30, add ical and gtk support 2011-03-15 23:09:14 +00:00
gnuvd
gparted gparted was not building. I updated it and made it build (it only likes parted 2.x). 2011-06-21 18:00:23 +00:00
grub * Sync with the trunk. 2012-01-20 15:29:04 +00:00
hddtemp * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
hdf5 Mandatory HDF5 sub-minor-version update with no old version copies around 2010-12-16 20:19:43 +00:00
heimdall svn path=/nixpkgs/trunk/; revision=28716 2011-08-21 00:10:12 +00:00
idutils
ised Adding ised 2011-01-01 20:28:38 +00:00
jdiskreport * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
kermit * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
keychain update keychain to 2.7.1 2011-01-31 09:42:44 +00:00
less
man
man-db
mc upgraded mc 2011-12-11 19:39:06 +00:00
mcrl
mcrl2
mdbtools Add Git version of mdbtools - UCS-2 capable 2010-09-30 16:50:37 +00:00
memtest86 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
minicom
most * Fix "most". Not clear how passing "-ncurses" to the linker ever 2012-01-18 19:44:16 +00:00
mssys
myhasktags * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
mysql2pgsql
pal
parallel GNU Parallel 20111222. 2012-01-18 20:52:45 +00:00
parted * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
partition-manager Switch to forward compatibility of kde45 on kde_baseapps. 2011-08-07 01:45:26 +00:00
pg_top
pk2cmd * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
proxytunnel
pv Updating pv 2011-04-23 20:58:15 +00:00
qdu
qjoypad * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
recutils GNU recutils 1.5. 2012-01-18 20:52:07 +00:00
remind
rlwrap Patch rlwrap to support high-bit characters 2010-12-17 10:56:35 +00:00
rockbox-utility * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
rrdtool Updating rrdtool. 2011-05-02 17:03:05 +00:00
screen pkgs/tools/misc/screen: fixed various impurities 2010-11-05 14:35:14 +00:00
shebangfix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
slsnif
system-config-printer * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 2012-01-18 20:53:01 +00:00
testdisk
time * Apply a patch to fix the "max resident" size reported by ‘time’ 2011-10-31 14:44:32 +00:00
timidity
tmux Updating tmux to 1.5. Patch sent to nix-dev by Phil Hagelberg. 2012-01-10 09:43:46 +00:00
ttf2pt1 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
ttmkfdir * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
unclutter unclutter: X cursor management tool 2012-01-08 14:01:17 +00:00
units
usbmuxd usbmuxd-1.0.7 2012-01-05 23:15:33 +00:00
uucp
vfdecrypt * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
vorbisgain Add vorbisgain - replaygain for ogg/vorbis 2011-03-06 16:07:37 +00:00
w3c-css-validator * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
wv
wv2
xburst-tools Updating xburst-tools (blind commit, I did not try to build them) 2012-01-06 21:06:22 +00:00
xclip
xdaliclock * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
xmltv
xsel
youtube-dl youtube-dl: new package (download clips from youtube) 2012-01-18 20:32:37 +00:00