diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-16 12:45:27 +0000 |
commit | 3593b97d631d554cfec9a5eec8966fadb3192de8 (patch) | |
tree | c1a1f0bbb9270c83c803f501e14ea451e8f9fc74 /pkgs/tools | |
parent | d574d882ccade3b159b16e7ea2b8aeffd9d13bcd (diff) | |
parent | 808f12e36961b15c9662bb6e890f9045cdab43ce (diff) | |
download | nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.gz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.bz2 nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.lz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.xz nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.tar.zst nixlib-3593b97d631d554cfec9a5eec8966fadb3192de8.zip |
* Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
Diffstat (limited to 'pkgs/tools')
46 files changed, 313 insertions, 161 deletions
diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix index 3452d3f893ba..76b096734512 100644 --- a/pkgs/tools/X11/x11vnc/0.9.3.nix +++ b/pkgs/tools/X11/x11vnc/0.9.3.nix @@ -18,11 +18,9 @@ stdenv.mkDerivation rec { (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - X11 VNC - VNC server connected to real X11 screen. -"; + description = "A VNC server connected to a real X11 screen"; homepage = "http://www.karlrunge.com/x11vnc/"; - inherit src; + inherit src; }; } diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix index 917995b719d4..0d805b44ac24 100644 --- a/pkgs/tools/X11/x2vnc/1.7.2.nix +++ b/pkgs/tools/X11/x2vnc/1.7.2.nix @@ -20,9 +20,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]); meta = { - description = " - x2vnc - program to control remote VNC server. -"; + description = "A program to control a remote VNC server"; inherit src; }; } diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index ad8fa50a299c..16a0e5dc6cb8 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, x11, zlib, libjpeg, imake, gccmakedep, libXmu, libXaw, libXpm, libXp , perl, xauth}: +# if you have any trouble connecting to the tightvnc server try $ rm ~/.Xauthority +# Dunno what happens here but it works. + stdenv.mkDerivation { name = "tightvnc-1.3.9"; builder = ./builder.sh; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index c79be7cffb45..a9cba3f7deec 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''rsnapshot is a filesystem snapshot utility for making - backups of local and remote systems.''; + description = "A filesystem snapshot utility for making backups of local and remote systems"; homepage = http://rsnapshot.org/; license = "GPLv2+"; }; diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 93a98891d135..8ec11e7ca9e4 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -4,12 +4,12 @@ assert libpng != null && libjpeg != null && expat != null; -stdenv.mkDerivation { - name = "graphviz-2.20.2"; +stdenv.mkDerivation rec { + name = "graphviz-2.20.3"; src = fetchurl { - url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.20.2.tar.gz; - sha256 = "13mw0mhr4n14c5q7a6c44cvggl5hiqbx53ynr53s67rldvzcilgm"; + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + sha256 = "0grrijj3ryacnc0qj8l6xp5nqnmff5nvx6ziij1r9lghzb17cdjq"; }; buildInputs = [pkgconfig x11 libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix new file mode 100644 index 000000000000..dc4b3ce95bbc --- /dev/null +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchsvn, libjpeg, libpng, flex, zlib, perl, libxml2 }: + +stdenv.mkDerivation { + name = "netpbm-advanced-844"; + + src = fetchsvn { + url = https://netpbm.svn.sourceforge.net/svnroot/netpbm/advanced; + rev = 844; + }; + + buildInputs = [ flex zlib perl libpng libjpeg libxml2 ]; + + configurePhase = "cp config.mk.in config.mk"; + + installPhase = '' + make package pkgdir=$PWD/netpbmpkg + # Pass answers to the script questions + ./installnetpbm << EOF + $PWD/netpbmpkg + $out + Y + $out/bin + $out/lib + N + $out/lib + $out/lib + $out/include + $out/man + N + EOF + ''; + + meta = { + homepage = http://netpbm.sourceforge.net/; + description = "Toolkit for manipulation of graphic images"; + license = "GPL,free"; + }; +} diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index 3efb7eab881e..f173f2f1e140 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -14,8 +14,7 @@ stdenv.mkDerivation { patches = [./ploticus-install.patch]; meta = { - description = ''Ploticus, a non-interactive software package for - producing plots and charts''; + description = "A non-interactive software package for producing plots and charts"; longDescription = ''Ploticus is a free, GPL'd, non-interactive software package for producing plots, charts, and graphics from diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index 67382191da53..f23bd8993cff 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -14,11 +14,13 @@ stdenv.mkDerivation rec { meta = { homepage = http://bogofilter.sourceforge.net/; - description = ''Bogofilter is a mail filter that classifies mail - as spam or ham (non-spam) by a statistical analysis of - the message's header and content (body). The program is - able to learn from the user's classifications and - corrections. It is based on a Bayesian filter.''; + longDescription = '' + Bogofilter is a mail filter that classifies mail as spam or ham + (non-spam) by a statistical analysis of the message's header and + content (body). The program is able to learn from the user's + classifications and corrections. It is based on a Bayesian + filter. + ''; license = "GPLv2"; }; } diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix new file mode 100644 index 000000000000..fd63016ddb88 --- /dev/null +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, glib}: + +stdenv.mkDerivation { + name = "desktop-file-utils-0.15"; + src = fetchurl { + url = http://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-0.15.tar.gz; + md5 = "2fe8ebe222fc33cd4a959415495b7eed"; + }; + buildInputs = [ pkgconfig glib ]; +} diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 0b77921e3492..e1e4cf01ad37 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { doCheck = true; + patches = [ ./nix-mapping.patch ]; + meta = { description = "GNU Idutils, a text searching utility"; diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/tools/misc/idutils/nix-mapping.patch new file mode 100644 index 000000000000..43e7439e2f60 --- /dev/null +++ b/pkgs/tools/misc/idutils/nix-mapping.patch @@ -0,0 +1,10 @@ +diff --git a/libidu/id-lang.map b/libidu/id-lang.map +index 7edb860..6dccd28 100644 +--- a/libidu/id-lang.map ++++ b/libidu/id-lang.map +@@ -92,3 +92,5 @@ Makefile.* make + + *.gz FILTER gzip -d <%s + *.Z FILTER gzip -d <%s ++ ++*.nix text diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index d135a63dd949..d256eda7a4b0 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,12 +1,22 @@ {stdenv, fetchurl, e2fsprogs, readline}: stdenv.mkDerivation { - name = "parted-1.8.7"; + name = "parted-1.8.8"; src = fetchurl { - url = mirror://gnu/parted/parted-1.8.7.tar.bz2; - sha256 = "0njabfinn1kbkdx80gayqanpammnl28pklli34bymhx1sxn82kk3"; + url = mirror://gnu/parted/parted-1.8.8.tar.bz2; + sha256 = "1sn5qcdi4pvxnxz8ryh5p52qmqd72qbk0d0a65pksxf7khd83kfz"; }; buildInputs = [e2fsprogs readline]; + preConfigure='' + export CFLAGS=-fgnu89-inline + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fgnu89-inline" + ''; configureFlags = "--without-readline"; + + meta = { + description = "industrial-strength package for creating, destroying, resizing, checking and copying partitions"; + homepage = http://www.gnu.org/software/parted/; + license = "GPLv3"; + }; } diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix index 3f7aae91f344..0638331dbe21 100644 --- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix +++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [build doMakeInstall doForceShare doPropagate]); meta = { - description = " - Relational FS over FUSE. -"; + description = "A relational filesystem on top of FUSE"; inherit src; }; } diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix index 90275c1b32f1..4f3627f19e33 100644 --- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix +++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix @@ -45,9 +45,7 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [build doMakeInstall doForceShare doPropagate]); meta = { - description = " - Relational FS over FUSE. -"; + description = "A relational filesystem on top of FUSE"; inherit src; }; } diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix new file mode 100644 index 000000000000..9a88d7a979f2 --- /dev/null +++ b/pkgs/tools/misc/remind/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl} : + +stdenv.mkDerivation { + name = "remind-3.1.6"; + src = fetchurl { + url = http://www.roaringpenguin.com/files/download/remind-03.01.06.tar.gz; + sha256 = "acdf73904c95de55b615d80c7c007abe58d75e41978a16a43333a22583ac7738"; + }; + + meta = { + homepage = http://www.roaringpenguin.com/products/remind; + description = "Sophisticated calendar and alarm program for the console"; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix index c694109c2e85..1bd453755102 100644 --- a/pkgs/tools/misc/rlwrap/0.28.nix +++ b/pkgs/tools/misc/rlwrap/0.28.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - Readline wrapper for console programs. -"; + description = "Readline wrapper for console programs"; inherit src; }; } diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix new file mode 100644 index 000000000000..05531482c795 --- /dev/null +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, perl, perlXMLParser, autoconf, automake, intltool, gettext, desktop_file_utils}: + +stdenv.mkDerivation { + name = "system-config-printer-0.9.93"; + src = fetchurl { + url = http://cyberelk.net/tim/data/system-config-printer/system-config-printer-0.9.93.tar.bz2; + md5 = "b97deae648bc1c5825874d250a9c140c"; + }; + patchPhase = '' + sed -i -e "s/xmlto/echo xmlto/" Makefile.am # Disable building manual pages + echo > man/system-config-printer.1 + echo > man/system-config-printer-applet.1 + ./bootstrap + ''; + buildInputs = [ perl perlXMLParser autoconf automake intltool gettext desktop_file_utils ]; +} diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix index fa3a54f6195e..fd9f45782940 100644 --- a/pkgs/tools/misc/testdisk/default.nix +++ b/pkgs/tools/misc/testdisk/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation { meta = { homepage = http://www.cgsecurity.org/wiki/TestDisk; license = "GPL"; - description = " + longDescription = '' TestDisk is a program for data recovery, primarily designed to help recover lost partitions and/or make non-booting disks - bootable again - "; + bootable again. + ''; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index d32f25e50b6b..3aa9247742b5 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,5 @@ args: with args; + stdenv.mkDerivation { name = "timidity-2.13.0"; @@ -7,25 +8,21 @@ stdenv.mkDerivation { sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; }; - instruments = - fetchurl { - url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; - sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; - }; - - buildInputs =[alsaLib]; + instruments = fetchurl { + url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; + sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; + }; - config=./timidity.cfg; + buildInputs = [alsaLib]; - postInstall = "mkdir -p \$out/share/timidity/; - cp \$config \$out/share/timidity/timidity.cfg; - tar -xf \$instruments -C \$out/share/timidity/; - "; + postInstall = '' + mkdir -p $out/share/timidity/; + cp ${./timidity.cfg} $out/share/timidity/timidity.cfg + tar -xf $instruments -C $out/share/timidity/ + ''; meta = { - description = " - TiMidity - software MIDI renderer. -"; + description = "A software MIDI renderer"; }; } diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 9fe71248e8d3..361a7b927b12 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,18 +1,16 @@ args: with args; + stdenv.mkDerivation { name = "wv-1.2.4"; src = fetchurl { - url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz; - sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7"; - }; + url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz; + sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7"; + }; - buildInputs = [zlib imagemagick libpng glib - pkgconfig libgsf libxml2 bzip2]; + buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2]; meta = { - description = " - Convertor from Microsoft Word formats to human-editable ones. -"; + description = "Converter from Microsoft Word formats to human-editable ones"; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 85e0c91a003d..6ca16e79db2b 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -7,11 +7,20 @@ stdenv.mkDerivation { sha256 = "614b9d63e13ad3e162c82b6405d1f67713fc622a8bc11337e72949d613713091"; }; + patches = [ ./pam-service-name.patch ]; + buildInputs = [gperf guile gmp zlib liboop gnum4 pam]; meta = { description = "GNU lsh, a GPL'd implementation of the SSH protocol"; + + longDescription = '' + lsh is a free implementation (in the GNU sense) of the ssh + version 2 protocol, currently being standardised by the IETF + SECSH working group. + ''; + homepage = http://www.lysator.liu.se/~nisse/lsh/; - license = "GPL"; + license = "GPLv2+"; }; } diff --git a/pkgs/tools/networking/lsh/pam-service-name.patch b/pkgs/tools/networking/lsh/pam-service-name.patch new file mode 100644 index 000000000000..6a6156855c51 --- /dev/null +++ b/pkgs/tools/networking/lsh/pam-service-name.patch @@ -0,0 +1,14 @@ +Tell `lsh-pam-checkpw', the PAM password helper program, to use a more +descriptive service name. + +--- lsh-2.0.4/src/lsh-pam-checkpw.c 2003-02-16 22:30:10.000000000 +0100 ++++ lsh-2.0.4/src/lsh-pam-checkpw.c 2008-11-28 16:16:58.000000000 +0100 +@@ -38,7 +38,7 @@ + #include <security/pam_appl.h> + + #define PWD_MAXLEN 1024 +-#define SERVICE_NAME "other" ++#define SERVICE_NAME "lshd" + #define TIMEOUT 600 + + static int diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix index 4ea5578abed4..b6155c7a053f 100644 --- a/pkgs/tools/networking/nc6/1.0.nix +++ b/pkgs/tools/networking/nc6/1.0.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - nc6 - one more netcat, IPv6 support included. - "; + description = "A netcat implementation with IPv6 support"; homepage = "http://www.deepspace6.net/projects/netcat6.html"; inherit src; }; diff --git a/pkgs/tools/networking/ncat/default.nix b/pkgs/tools/networking/ncat/default.nix index cc3ad321de8e..8f81e9284b60 100644 --- a/pkgs/tools/networking/ncat/default.nix +++ b/pkgs/tools/networking/ncat/default.nix @@ -1,4 +1,5 @@ {stdenv, fetchurl, openssl}: + stdenv.mkDerivation { name = "ncat-0.10rc3"; @@ -7,18 +8,18 @@ stdenv.mkDerivation { sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb"; }; - patches = [./ncat-0.10rc3.patch ]; + patches = [./ncat-0.10rc3.patch]; - buildInputs = [openssl ]; + buildInputs = [openssl]; CFLAGS = "-g"; - postInstall = "install -D ncat \${out}/bin/ncat ; - install -D docs/man/ncat.1 \${out}/man/ncat.1 ;"; + postInstall = '' + install -D ncat $out/bin/ncat + install -D docs/man/ncat.1 $out/man/ncat.1 + ''; meta = { - description = " - Ncat - some effort to join features from different `netcat's. Supports IPv6. -"; + description = "A netcat implementation with IPv6 support"; }; } diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix new file mode 100644 index 000000000000..3d1563f9520d --- /dev/null +++ b/pkgs/tools/networking/nylon/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, libevent} : + +stdenv.mkDerivation { + name = "nylon-1.21"; + src = fetchurl { + url = http://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; + }; + + configureFlags = [ "--with-libevent=${libevent}" ]; + + buildInputs = [ libevent ]; + + meta = { + homepage = http://monkey.org/~marius/nylon; + description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode."; + license = "free"; + }; +} diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index d8cdc26fd38c..50acf00678f9 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec { buildInputs = [ pkgconfig openssl libsigcxx ]; meta = { - description = " - LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code. - "; + description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; }; }) diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 04b50f9d5d25..2999da115fb0 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; meta = { - description = " - rtorrent is a ncurses client for libtorrent and is ideal for use with screen or dtach. - "; + description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; }; }) diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix index c5ef3ebeae0e..be25331460a0 100644 --- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix +++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall postInstall doForceShare doPropagate]); - meta = { - description = " - Samba mounted via FUSE. -"; - inherit src; - }; + meta = { + description = "Samba mounted via FUSE"; + inherit src; + }; } diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix new file mode 100644 index 000000000000..fa225877b403 --- /dev/null +++ b/pkgs/tools/networking/stunnel/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation { + name = "stunnel-4.26"; + + src = fetchurl { + url = http://www.stunnel.org/download/stunnel/src/stunnel-4.26.tar.gz; + sha256 = "1lvbd25krcz1sqk5pj2fv3r32h0160qdxrbzlqqs0kz8f987krp9"; + }; + + buildInputs = [openssl]; + + meta = { + description = "Stunnel - Universal SSL wrapper"; + homepage = http://www.stunnel.org/; + license = "GPLv2"; + }; +} diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index 1e6a809a8e98..2d8adc1350a1 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, perl, zlib, bzip2}: stdenv.mkDerivation { - name = "dpkg-1.14.22"; + name = "dpkg-1.14.25"; src = fetchurl { - url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.22.tar.gz; - sha256 = "10ak9p7ylmfc76hfjqhzyblh2cgc5g4s8ljbxzya1yszsvb59sgq"; + url = mirror://debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz; + sha256 = "1111r1ijyh149h7vby9vc8137hl9778ja3dln7ilkxhc1y1yjp2l"; }; configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg"; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index c613f2f63f9c..3ce33f6f6be0 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "nix-0.13pre13641"; + name = "nix-0.13pre14422"; src = fetchurl { - url = http://hydra.nixos.org/download/546/1/nix-0.13pre13641.tar.bz2; - sha256 = "83936327ed7cfa6e6a103764c3f43c780b2727ed804721200811ba999c31c7e1"; + url = http://hydra.nixos.org/build/2775/download/1/nix-0.13pre14422.tar.bz2; + sha256 = "29362caa3fece6eae9d06a14930bf04fba41801b79a0f43eefb2ecc719fab934"; }; buildInputs = [perl curl openssl]; @@ -23,6 +23,8 @@ stdenv.mkDerivation { doCheck = true; + passthru = { inherit aterm; }; + meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; diff --git a/pkgs/tools/security/gnupg2/default.nix b/pkgs/tools/security/gnupg2/default.nix index 19fa84ae6500..9bab4b5c7877 100644 --- a/pkgs/tools/security/gnupg2/default.nix +++ b/pkgs/tools/security/gnupg2/default.nix @@ -5,11 +5,11 @@ , pth, libgcrypt, libassuan, libksba, libusb, curl }: stdenv.mkDerivation rec { - name = "gnupg-2.0.10"; + name = "gnupg-2.0.11"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "08yz2kgcnphjml5mhq4bm4dg64jrz79p97nlrlb88ym6p6ybg26l"; + sha256 = "0z5lm0zz8l8yn61jbbyy0frrbhsjyvmq8pxwhgjsgx3isj518h4c"; }; buildInputs = [ readline openldap bzip2 zlib libgpgerror pth libgcrypt @@ -33,5 +33,7 @@ stdenv.mkDerivation rec { ''; homepage = http://gnupg.org/; + + license = "GPLv3+"; }; } diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix index 1725d7ab903a..b9a8d42541e7 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.3.nix @@ -20,9 +20,7 @@ stdenv.mkDerivation rec { (textClosure localDefs ["doPatch" doMakeInstall doForceShare doPropagate]); meta = { - description = " - Elliptic Curve Cryptography. Zero-configuration. -"; + description = "Zero-configuration elliptic curve cryptography utility"; inherit src; }; } diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index 28c591850699..a6e8429a9df0 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { (textClosure localDefs ["doPatch" doMakeInstall doForceShare doPropagate]); meta = { - description = " - Shamir Secret Sharing Scheme -"; + description = "Shamir Secret Sharing Scheme"; inherit src; }; } diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 61726cf31751..be5933ea45e0 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, coreutils, pam}: stdenv.mkDerivation rec { - name = "sudo-1.6.9p17"; + name = "sudo-1.7.0"; src = fetchurl { - url = "http://www.sudo.ws/sudo/dist/${name}.tar.gz"; - sha256 = "15j5qzwn1nl9fr6ss3b2fk803cin3w11081rgqmm8vscd3zx8b0y"; + url = "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"; + sha256 = "0y0r74vvcn1q4c220ha0azs8d4kyjr3x3bl6ilxqp77khx1fjzaz"; }; # `--with-stow' allows /etc/sudoers to be a symlink. Only it @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { postConfigure = " sed -e '/_PATH_MV/d; /_PATH_VI/d' -i config.h + echo '#define _PATH_SUDO_LOGFILE \"/var/log/sudo.log\"' >> config.h + echo '#define _PATH_SUDO_TIMEDIR \"/var/run/sudo\"' >> config.h echo '#define _PATH_MV \"/var/run/current-system/sw/bin/mv\"' >> config.h echo '#define _PATH_VI \"/var/run/current-system/sw/bin/nano\"' >> config.h echo '#define EDITOR _PATH_VI' >>config.h diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index 21b35ad9b956..3acc5fd877dd 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation { src = fetchurl { # Debian is apparently the last location where it can be found. - url = mirror://debian/pool/main/a/at/at_3.1.10.1.tar.gz; - sha256 = "188j6v0hq9avd9v7mhc8gdyg4wycc7lqviw4idwn0jjvwkky5428"; + url = mirror://debian/pool/main/a/at/at_3.1.10.2.tar.gz; + sha256 = "03v96zil1xs15px26xmhxsfn7wx84a3zwpnwmp69hn5s911api1m"; }; patches = [ ./install.patch ]; @@ -28,4 +28,4 @@ stdenv.mkDerivation { license = "GPLv2+"; homepage = http://packages.qa.debian.org/at; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/filelight/default.nix b/pkgs/tools/system/filelight/default.nix index 901f41f5ac33..872c56f700ea 100644 --- a/pkgs/tools/system/filelight/default.nix +++ b/pkgs/tools/system/filelight/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl, - libpng}: +{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl, libpng}: + stdenv.mkDerivation { name = "filelight-1.0"; @@ -9,14 +9,15 @@ stdenv.mkDerivation { }; buildInputs = [kdelibs qt x11 zlib perl libpng]; - configureFlags = " --without-debug --without-arts "; - preConfigure = "sed -e '/sys_lib_\(dl\)\{0,1\}search_path_spec=/d' -i configure; - sed -e '/X_LDFLAGS=/d' -i configure"; + + configureFlags = "--without-debug --without-arts"; + + preConfigure = '' + sed -e '/sys_lib_\(dl\)\{0,1\}search_path_spec=/d' -i configure + sed -e '/X_LDFLAGS=/d' -i configure + ''; meta = { - description = " - Filelight lets you analyze which directories - and files eat your disk space. -"; + description = "A tool for analysing which directories and files eat your disk space"; }; } diff --git a/pkgs/tools/system/gdmap/0.7.5.nix b/pkgs/tools/system/gdmap/0.7.5.nix index 7f686cb10e6d..ef07df5bf8d5 100644 --- a/pkgs/tools/system/gdmap/0.7.5.nix +++ b/pkgs/tools/system/gdmap/0.7.5.nix @@ -15,9 +15,7 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - Recursive rectangle map of disk usage. -"; + description = "Recursive rectangle map of disk usage"; inherit src; }; } diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix index ee2bd707fff7..982d5651f652 100644 --- a/pkgs/tools/system/gdmap/0.8.1.nix +++ b/pkgs/tools/system/gdmap/0.8.1.nix @@ -11,13 +11,11 @@ args : with args; }; in with localDefs; stdenv.mkDerivation rec { - name = "gdmap"+version; + name = "gdmap-"+version; builder = writeScript (name + "-builder") (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - Recursive rectangle map of disk usage. -"; + description = "Recursive rectangle map of disk usage"; inherit src; }; } diff --git a/pkgs/tools/system/pciutils/builder.sh b/pkgs/tools/system/pciutils/builder.sh deleted file mode 100644 index 4cf93bef868f..000000000000 --- a/pkgs/tools/system/pciutils/builder.sh +++ /dev/null @@ -1,10 +0,0 @@ -source $stdenv/setup - -preBuild=preBuild -preBuild() { - bunzip2 < $pciids > pci.ids -} - -makeFlags="PREFIX=$out $makeFlags" - -genericBuild diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 92ebcbdad06a..d9ef0474c498 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,24 +1,27 @@ {stdenv, fetchurl, zlib}: stdenv.mkDerivation { - name = "pciutils-3.0.0"; - - builder = ./builder.sh; + name = "pciutils-3.1.2"; src = fetchurl { - url = mirror://kernel/software/utils/pciutils/pciutils-3.0.0.tar.bz2; - sha256 = "1q9j7w95ysy6c02j7p3z58y23n5v2cdjwy6hz8s9xzvnlr0ynpnh"; + url = mirror://kernel/software/utils/pciutils/pciutils-3.1.2.tar.bz2; + sha256 = "15wksvqcgdj0hvsp5irc1igiqid69rrzpc33qj9nlyssvyw40vpn"; }; buildInputs = [zlib]; pciids = fetchurl { - url = http://nixos.org/tarballs/pci.ids.20080830.bz2; - sha256 = "0nfjj9lsifmm6js9w0isrscirr1a7dj9ynppbc0g5i19rzrmwafy"; + # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2. + url = http://nixos.org/tarballs/pci.ids.20090220.bz2; + sha256 = "1zdp85vcxhgrw1rwcsa35pk4j1b3scb7i61gzghbcn2mrm9cwwd9"; }; # Override broken auto-detect logic. - makeFlags = "ZLIB=yes DNS=yes"; + makeFlags = "ZLIB=yes DNS=yes SHARED=yes PREFIX=\${out}"; + + preBuild = '' + bunzip2 < $pciids > pci.ids + ''; installTargets = "install install-lib"; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 2a09167b9ce0..185c621f7dd5 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { - name = "ts-0.6.2"; + name = "ts-0.6.4"; installPhase=''make install "PREFIX=$out"''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.2.tar.gz; - sha256 = "6a99b48800658fb7424a76c5756a638a6b6abb2a8a8c129e196bc24a9aeeb5cc"; + url = http://vicerveza.homeunix.net/~viric/soft/ts/ts-0.6.4.tar.gz; + sha256 = "caf3e912c150dacc4a182e919ed3eabc1294c5e4e1de333e85d06eea2c0136e3"; }; meta = { homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; diff --git a/pkgs/tools/text/py-string-template/default.nix b/pkgs/tools/text/py-string-template/default.nix deleted file mode 100644 index 0ca503a16ac4..000000000000 --- a/pkgs/tools/text/py-string-template/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, fetchurl, python}: - -stdenv.mkDerivation rec { - name = "PyStringTemplate-${version}"; - version = "3.2b1"; - meta = { - homepage = "http://www.stringtemplate.org/"; - description = "Text Templating Library"; - }; - src = fetchurl { - url = "http://www.stringtemplate.org/download/PyStringTemplate-3.2b1.tar.gz"; - sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; - }; - propagatedBuildInputs = [python]; - buildPhase = "true"; - installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1"; -} diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index ab6c9aef0aef..8ab1ba98e430 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -44,9 +44,10 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''AsciiDoc is a text-based document generation system. - AsciiDoc input files can be translated to HTML and - DocBook markups''; + longDescription = '' + AsciiDoc is a text-based document generation system. AsciiDoc + input files can be translated to HTML and DocBook markups. + ''; homepage = http://www.methods.co.nz/asciidoc/; license = "GPLv2+"; }; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index a6e56f1c53bb..30276fcb6f66 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -44,9 +44,11 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''docbook2X is a software package that converts DocBook - documents into the traditional Unix man page format - and the GNU Texinfo format.''; + longDescription = '' + docbook2X is a software package that converts DocBook documents + into the traditional Unix man page format and the GNU Texinfo + format. + ''; license = "MIT-style"; homepage = http://docbook2x.sourceforge.net/; }; diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix new file mode 100644 index 000000000000..054632533a11 --- /dev/null +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -0,0 +1,32 @@ +{ fetchurl, stdenv, python, texinfo }: + +stdenv.mkDerivation rec { + name = "rubber-1.1"; + + src = fetchurl { + url = "http://ebeffara.free.fr/pub/${name}.tar.gz"; + sha256 = "1xbkv8ll889933gyi2a5hj7hhh216k04gn8fwz5lfv5iz8s34gbq"; + }; + + buildInputs = [ python texinfo ]; + + patchPhase = "substituteInPlace configure --replace which \"type -P\""; + + meta = { + description = "Rubber, a wrapper for LaTeX and friends"; + + longDescription = '' + Rubber is a program whose purpose is to handle all tasks related + to the compilation of LaTeX documents. This includes compiling + the document itself, of course, enough times so that all + references are defined, and running BibTeX to manage + bibliographic references. Automatic execution of dvips to + produce PostScript documents is also included, as well as usage + of pdfLaTeX to produce PDF documents. + ''; + + license = "GPLv2+"; + + homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/; + }; +} |