public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging from trunk. I had to do two manual merges, quite trivial I think.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
This commit is contained in:
Lluís Batlle i Rossell
2009-11-19 19:09:10 +00:00
parent 7ade207f6b 58f543f19f
commit e85500987b
119 changed files with 1750 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/tools/X11/x11vnc/0.9.3.nix
View File

@@ -14,7 +14,7 @@ args : with args; with builderDefs;
});
in with localDefs;
stdenv.mkDerivation rec {
name = "x11vnc-"+version;
name = "x11vnc-0.9.3";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);

2
pkgs/tools/X11/x2vnc/1.7.2.nix
View File

@@ -15,7 +15,7 @@ args : with args; with builderDefs.passthru.function {src="";};
}) // args); /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "x2vnc-"+version;
name = "x2vnc-1.7.2";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);

7
pkgs/tools/archivers/sharutils/4.6.3.nix
View File

@@ -1,9 +1,10 @@
args: with args;
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "sharutils-" + version;
name = "sharutils-4.6.3";
src = fetchurl {
url = "mirror://gnu/sharutils/REL-${version}/${name}.tar.bz2";
url = "mirror://gnu/sharutils/REL-4.6.3/${name}.tar.bz2";
sha256 = "1sirrzas8llcsd8gnh56pns39wa1f803vff1kmy5islfi1p9vqk8";
};

16
pkgs/tools/misc/mdbtools/0.6-pre1.nix → pkgs/tools/misc/mdbtools/default.nix
View File

@@ -1,21 +1,19 @@
args : with args;
rec {
{ stdenv, fetchurl, glib, readline, bison, flex, pkgconfig }:
stdenv.mkDerivation {
name = "mdbtools-0.6pre1";
src = fetchurl {
url = http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.6pre1.tar.gz;
sha256 = "1lz33lmqifjszad7rl1r7rpxbziprrm5rkb27wmswyl5v98dqsbi";
};
buildInputs = [glib readline bison flex pkgconfig];
configureFlags = [];
preConfigure = fullDepEntry (''
preConfigure = ''
sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c
'') ["doUnpack" "minInit"];
'';
/* doConfigure should be specified separately */
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
name = "mdbtools-" + version;
meta = {
description = ".mdb (MS Access) format tools";
};

18
pkgs/tools/misc/minicom/2.3.nix
View File

@@ -1,18 +0,0 @@
args : with args;
rec {
src = fetchurl {
url = http://alioth.debian.org/frs/download.php/2332/minicom-2.3.tar.gz;
sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
};
buildInputs = [ncurses];
configureFlags = [ "--sysconfdir=/etc" ];
/* doConfigure should be specified separately */
phaseNames = [ "doConfigure" "doMakeInstall"];
name = "minicom-" + version;
meta = {
description = "Serial console";
};
}

18
pkgs/tools/misc/minicom/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, fetchurl, ncurses }:
stdenv.mkDerivation rec {
name = "minicom-2.3";
src = fetchurl {
url = "http://alioth.debian.org/frs/download.php/2332/${name}.tar.gz";
sha256 = "1ysn0crdhvwyvdlbw0ms5nq06xy2pd2glwjs53p384byl3ac7jra";
};
buildInputs = [ncurses];
configureFlags = [ "--sysconfdir=/etc" ];
meta = {
description = "Serial console";
};
}

2
pkgs/tools/misc/relfs/cvs.2008.03.05.nix
View File

@@ -43,7 +43,7 @@ args : with args;
assert args.libuuid != null;
stdenv.mkDerivation rec {
name = "relfs-"+version;
name = "relfs-2008.03.05";
builder = writeScript (name + "-builder")
(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
meta = {

2
pkgs/tools/misc/rlwrap/0.28.nix
View File

@@ -11,7 +11,7 @@ args : with args; with builderDefs;
};
in with localDefs;
stdenv.mkDerivation rec {
name = "rlwrap-"+version;
name = "rlwrap-0.28";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);

14
pkgs/tools/misc/uucp/1.07.nix → pkgs/tools/misc/uucp/default.nix
View File

@@ -1,17 +1,13 @@
args : with args;
rec {
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "uucp-1.07";
src = fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/u/uucp/uucp_1.07.orig.tar.gz;
sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306";
};
buildInputs = [];
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "uucp-" + version;
meta = {
description = "Unix-unix cp over serial line, also includes cu program";
};

2
pkgs/tools/networking/nc6/1.0.nix
View File

@@ -11,7 +11,7 @@ let localDefs = builderDefs.passthru.function (rec {
});
in with localDefs;
stdenv.mkDerivation rec {
name = "nc6-"+version;
name = "nc6-1.0";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);

2
pkgs/tools/networking/smbfs-fuse/0.8.7.nix
View File

@@ -17,7 +17,7 @@ args : with args; with builderDefs;
};
in with localDefs;
stdenv.mkDerivation rec {
name = "smbfs-fuse-"+version;
name = "smbfs-fuse-0.8.7";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall postInstall doForceShare doPropagate]);

25
pkgs/tools/networking/socat/1.6.0.1.nix
View File

@@ -1,25 +0,0 @@
args : with args;
rec {
src = /* Here a fetchurl expression goes */
fetchurl {
url = http://www.dest-unreach.org/socat/download/socat-1.6.0.1.tar.bz2;
sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
};
buildInputs = [openssl];
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doPatch" "doConfigure" "doMakeInstall"];
name = "socat-" + version;
meta = {
description = "Socat - a different replacement for netcat";
longDesc = "
Socat, one more analogue of netcat, but not mimicking it.
'netcat++' (extended design, new implementation)
";
homepage = "http://www.dest-unreach.org/socat/";
srcs = patches;
};
}

17
pkgs/tools/networking/socat/default.nix Normal file
View File

@@ -0,0 +1,17 @@
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation rec {
name = "socat-1.6.0.1";
src = fetchurl {
url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
sha256 = "1cl7kf0rnbvjxz8vdkmdh1crd069qmz1jjw40r8bydgpn0nsh6qd";
};
buildInputs = [openssl];
meta = {
description = "Socat - a different replacement for netcat";
homepage = "http://www.dest-unreach.org/socat/";
};
}

2
pkgs/tools/security/metasploit/3.1.nix
View File

@@ -22,7 +22,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")];
name = "metasploit-framework" + version;
name = "metasploit-framework-3.1";
meta = {
description = "Metasploit Framework - a collection of exploits";
homepage = "http://framework.metasploit.org/";

2
pkgs/tools/security/ssss/0.5.nix
View File

@@ -18,7 +18,7 @@ args : with args; with builderDefs;
});
in with localDefs;
stdenv.mkDerivation rec {
name = "ssss-"+version;
name = "ssss-0.5";
builder = writeScript (name + "-builder")
(textClosure localDefs
["doPatch" doMakeInstall doForceShare doPropagate]);

20
pkgs/tools/system/ddrescue/1.8.nix
View File

@@ -1,20 +0,0 @@
args : with args;
rec {
src = fetchurl {
url = http://ftp.gnu.org/gnu/ddrescue/ddrescue-1.8.tar.bz2;
sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
};
buildInputs = [];
configureFlags = [];
/* doConfigure should be specified separately */
phaseNames = ["doConfigure" "doMakeInstall"];
name = "ddrescue-" + version;
meta = {
description = "GNU ddrescue - advanced dd for corrupted media";
};
}

15
pkgs/tools/system/ddrescue/default.nix Normal file
View File

@@ -0,0 +1,15 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "ddrescue-1.8";
src = fetchurl {
url = "http://ftp.gnu.org/gnu/ddrescue/${name}.tar.bz2";
sha256 = "080k1s4knh9baw3dxr5vqjjph6dqzkfpk0kpld0a3qc07vsxmhbz";
};
meta = {
description = "GNU ddrescue - advanced dd for corrupted media";
};
}

2
pkgs/tools/system/gdmap/0.8.1.nix
View File

@@ -11,7 +11,7 @@ args : with args;
};
in with localDefs;
stdenv.mkDerivation rec {
name = "gdmap-"+version;
name = "gdmap-0.8.1";
builder = writeScript (name + "-builder")
(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = {

2
pkgs/tools/text/cheetah-template/2.0.1.nix
View File

@@ -11,7 +11,7 @@ rec {
/* doConfigure should be specified separately */
phaseNames = ["installPythonPackage" (makeManyWrappers ''$out/bin/*'' ''--prefix PYTHONPATH : $(toPythonPath $out)'')];
name = "cheetah-template-" + version;
name = "cheetah-template-2.0.1";
meta = {
description = "Templating engine";
};

20
pkgs/tools/text/highlight/2.6.10.nix
View File

@@ -1,20 +0,0 @@
args : with args;
rec {
src = fetchurl {
url = http://www.andre-simon.de/zip/highlight-2.6.10.tar.bz2;
sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
};
buildInputs = [getopt];
configureFlags = [];
makeFlags = ["PREFIX=$out"];
/* doConfigure should be specified separately */
phaseNames = ["doMakeInstall"];
name = "highlight-" + version;
meta = {
description = "Source code highlighting tool";
};
}

18
pkgs/tools/text/highlight/default.nix Normal file
View File

@@ -0,0 +1,18 @@
{ stdenv, fetchurl, getopt }:
stdenv.mkDerivation rec {
name = "highlight-2.6.10";
src = fetchurl {
url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
sha256 = "18f2ki9pajxlp0aq4ingxj7m0cp7wlbc40xm25pnxc1yis9vlira";
};
buildInputs = [getopt];
makeFlags = ["PREFIX=$out"];
meta = {
description = "Source code highlighting tool";
};
}