Merging from trunk (conflict on glibc, I think I resolved it)

svn path=/nixpkgs/branches/stdenv-updates/; revision=21879
This commit is contained in:
Lluís Batlle i Rossell
2010-05-19 15:26:00 +00:00
293 changed files with 6525 additions and 1538 deletions
+30
View File
@@ -0,0 +1,30 @@
{stdenv, fetchurl, slang}:
stdenv.mkDerivation {
name = "most-5.0.0";
src = fetchurl {
url = ftp://space.mit.edu/pub/davis/most/most-5.0.0.tar.bz2;
sha256 = "1f5x7rvjg89b5klfqs1gb91jmbnd3fy08d8rwgdvgg0plqkxr7ja";
};
preConfigure = ''
sed -i -e "s|-ltermcap|-ncurses|" configure
sed -i autoconf/Makefile.in src/Makefile.in \
-e "s|/bin/cp|cp|" \
-e "s|/bin/rm|rm|"
'';
configureFlags = "--with-slang=${slang}";
buildInputs = [ slang ];
meta = {
description = ''
MOST is a powerful paging program for Unix, VMS, MSDOS, and win32
systems. Unlike other well-known paging programs most supports multiple
windows and can scroll left and right. Why settle for less?
'';
homepage = http://www.jedsoft.org/most/index.html;
license = "GPLv2";
};
}
+46
View File
@@ -0,0 +1,46 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20100424";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0japyn4n044zpd88czsrfh4lyjmckih25jl671vby8v5mhk42vw4";
};
patchPhase =
'' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
'';
buildInputs = [ perl ];
doCheck = true;
meta = {
description = "GNU Parallel, a shell tool for executing jobs in parallel";
longDescription =
'' GNU Parallel is a shell tool for executing jobs in parallel. A job
is typically a single command or a small script that has to be run
for each of the lines in the input. The typical input is a list of
files, a list of hosts, a list of users, or a list of tables.
If you use xargs today you will find GNU Parallel very easy to use.
If you write loops in shell, you will find GNU Parallel may be able
to replace most of the loops and make them run faster by running
jobs in parallel. If you use ppss or pexec you will find GNU
Parallel will often make the command easier to read.
GNU Parallel makes sure output from the commands is the same output
as you would get had you run the commands sequentially. This makes
it possible to use output from GNU Parallel as input for other
programs.
'';
homepage = http://www.gnu.org/software/parallel/;
license = "GPLv3+";
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
+28
View File
@@ -0,0 +1,28 @@
{stdenv, fetchurl, libusb, makeWrapper}:
assert stdenv.isLinux;
stdenv.mkDerivation {
name = "pk2cmd-1.20";
src = fetchurl {
url = http://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz;
sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h";
};
makeFlags = [ "LIBUSB=${libusb}" "linux" ];
installPhase = ''
ensureDir $out/bin $out/share/pk2
cp pk2cmd $out/bin
cp PK2DeviceFile.dat $out/share/pk2
wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2
'';
buildInputs = [ libusb makeWrapper ];
meta = {
homepage = http://www.microchip.com/pickit2;
license = "nonfree";
description = "Microchip PIC programming software for the PICKit2 programmer";
};
}