JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
fde3526e7d
nixpkgs/pkgs/tools/misc
History
Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates 
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.

Signed-off-by: Shea Levy <shea@shealevy.com>

Conflicts:
	pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04: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 * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
bogofilter * Cleaned up a lot of description fields that contained newlines. 2009-03-03 13:27:40 +00:00
cloc Add cloc-1.58 2013-03-16 15:06:23 +01:00
convmv do not build convmv on darwin 2011-01-05 10:07:42 +00:00
coreutils Merge changes from branch 'master' into stdenv-updates. 2013-04-19 11:48:11 +02:00
cowsay Add cowsay to the channel 2013-01-30 12:52:07 +01:00
cunit cunit: Add meta information 2011-09-07 03:45:51 +00:00
dbacl Added i3wm. Added newer version of file. (this time tested, I screwed up a patch by garbas) 2012-04-30 14:34:57 +00:00
debian-devscripts Fix some of the debian-devscripts shell references 2012-10-09 11:02:06 +04:00
debootstrap Merging pull request 121 from MarcWeber: update/fix debootstrap with minor fixes 2012-10-05 12:26:13 +04:00
desktop-file-utils Add some packages to the channel 2012-08-17 09:53:55 -04:00
detox Applying the patch adding 'detox' from Tom Ridge and Karn Kallio. 2010-09-06 07:21:08 +00:00
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 Updating ethtool (we had a 5-year-old ethtool) 2012-05-31 16:03:49 +00:00
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 Fix installation of figlet 2.2.4. 2012-06-11 07:15:10 +00:00
file file: bump from 5.11 to 5.12 2013-02-18 11:46:47 +01:00
fileschanged Patch unused variable errors 2012-04-12 21:28:45 +00:00
findutils Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
fontforge A kludge to avoid removal of zlib from RPATH -- needed for LilyPond build 2012-02-06 05:49:27 +00:00
fortune * Fortune: use a "-" instead of a "_" to separate the package name 2012-06-12 23:41:05 +00:00
g500-control g500-control: Add meta.platforms. 2013-03-27 20:59:57 +01:00
getopt * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
gnokii Update gnokii 2012-12-04 10:20:42 +04:00
gnuvd * added gnuvd, dutch dictionary application 2009-09-16 08:36:05 +00:00
gparted gparted: update 2013-03-23 20:25:35 +01:00
grub grub: fix download URL for grub-0.97-once.patch 2013-04-07 23:33:20 +02:00
gsmartcontrol added gsmartcontrol 0.8.7 to nixpkgs 2012-10-12 00:45:42 +00:00
gummiboot Gummiboot: Update to 23. 2013-02-21 12:39:25 -05:00
hddtemp hddtemp: try to fix by Gentoo patches 2013-02-28 16:00:49 +01:00
hdf5 hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10 2013-04-11 10:54:31 +02:00
heimdall svn path=/nixpkgs/trunk/; revision=28716 2011-08-21 00:10:12 +00:00
idutils idutils: Fix gets() problem 2012-09-24 17:43:47 -04:00
ised Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
jdiskreport Document that Java packages should install JARs in $out/lib/java 2012-11-08 16:31:08 +01: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 Update less to version 451 2013-02-28 20:33:37 +01:00
lockfile-progs add lockfile-progs-0.1.16 2012-08-25 11:20:09 +02:00
logstash Add logstash 2012-07-11 07:23:14 -04:00
man * man: Prefer /etc/man.conf over $out/lib/man.conf. Man only reads 2012-03-06 10:14:00 +00:00
man-db * man -> man-db. 2008-02-10 17:40:46 +00:00
mc Remove a bunch of unreferenced files 2012-11-29 13:43:37 +01:00
mcrl * added mCRL 2009-06-05 13:32:39 +00:00
mcrl2 * libX11 dep MCRL2 2009-06-07 16:17:49 +00:00
mdbtools Add Git version of mdbtools - UCS-2 capable 2010-09-30 16:50:37 +00:00
memtest86 Adding the memtest86 from memtest86.com, and renaming the top-level attribute 2012-04-09 19:54:34 +00:00
minicom Minicom 2.4. 2010-09-03 20:52:32 +00:00
mktorrent mktorrent: fixing the usual pthread_cancel problem 2013-03-12 20:01:07 +01:00
mmv mmv: New package, version 1.01b from Debian. 2012-09-10 19:54:53 +02:00
most * Fix "most". Not clear how passing "-ncurses" to the linker ever 2012-01-18 19:44:16 +00:00
mssys * Added ms-sys, a program for writing Microsoft compatible boot records. 2008-01-31 10:40:21 +00:00
multitail Add multitail 2013-03-31 19:40:11 +02:00
myhasktags * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
mysql2pgsql * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
ncdu ncdu: set platforms 2013-05-04 20:34:15 +02:00
pal Adding the calendar program 'pal' 2010-08-09 21:13:36 +00:00
parallel GNU Parallel 20120322. 2012-04-09 20:50:54 +00:00
parted parted: remove 2.3.*, no longer used 2013-02-14 13:13:51 +01:00
partition-manager kdePackages.partitionManager: fix via update to Gentoo version 2013-02-23 20:32:54 +01:00
pg_top added pg_top 2009-10-08 08:53:21 +00:00
picocom picocom: adding picocom, 1.7 2012-09-25 19:23:34 +02:00
pk2cmd * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
plowshare Update plowshare to plowshare4-git20121126.e7e4480 2012-11-30 12:45:19 +01:00
proxytunnel * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
pv pv: upgrade to 1.3.4 2012-08-21 12:38:44 +02:00
qjoypad * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
recutils recutils: supply the forgotten patch 2013-03-09 13:54:55 +01:00
refind rEFInd: 0.4.5 2012-10-07 16:54:02 -04:00
remind "Remind" update. 2010-04-21 07:00:49 +00:00
renameutils Add renameutils package. 2013-03-25 13:45:01 +00:00
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 screen: fix some annoying bugs by importing patches from ArchLinux 2013-03-17 12:24:49 +00:00
shebangfix * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
sl Adding Steam Locomotive, for the fun 2013-03-25 14:57:45 +01:00
slsnif * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
system-config-printer system-config-printer patch 2013-01-24 23:03:39 -05:00
testdisk testdisk: updating to 6.13 2012-10-12 15:43:26 +02:00
time * Apply a patch to fix the "max resident" size reported by ‘time’ 2011-10-31 14:44:32 +00:00
timidity Fix timidity source url 2012-10-02 11:23:43 +04:00
tmux tmux: update to version 1.8 2013-04-01 16:24:08 -06:00
ttf2pt1 Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01: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 Added some descriptions. 2007-06-26 11:49:45 +00:00
usbmuxd Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
uucp uucp: Fetch from mirror://gnu; add `meta'. 2010-09-07 08:02:36 +00:00
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 * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
wv2 wv2: update and fix 2013-02-23 19:29:02 +01:00
xburst-tools Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
xclip xclip: Bump 2012-08-20 16:36:10 -04:00
xdaliclock * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
xmltv * Drop the "perl" prefix from Perl attribute names. It's redundant 2009-04-20 12:49:35 +00:00
xsel * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl 2007-08-24 12:32:36 +00:00
xvfb-run xvfb-run: add some runtime dependencies to wrapper, set FONTCONFIG_FILE 2012-08-07 03:27:00 +02:00
youtube-dl Merge remote-tracking branch 'central/master' into stdenv-updates 2013-01-27 11:32:12 +01:00