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

Merging from trunk.

Browse Source 
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
This commit is contained in:
Lluís Batlle i Rossell
2010-08-02 15:48:19 +00:00
parent 9724fb271b fd268b4852
commit 5417c720fd
674 changed files with 10063 additions and 117749 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/bfr/default.nix
+8 -7
View File
@@ -1,17 +1,18 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation {
name = "bfr-1.6";
src = args.fetchurl {
src = fetchurl {
url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2;
sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy";
};
buildInputs =(with args; [perl]);
buildInputs = [ perl ];
meta = {
description = "general-purpose command-line pipe buffer";
homepage = http://www.glines.org/wiki/bfr;
license = "GPL2";
description = "general-purpose command-line pipe buffer";
homepage = http://www.glines.org/wiki/bfr;
license = "GPL2";
};
}
pkgs/tools/misc/convmv/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, perl }:
stdenv.mkDerivation rec {
name = "convmv-1.14";
src = fetchurl {
url = "http://www.j3e.de/linux/convmv/${name}.tar.gz";
sha256 = "1vvwrbys5kkfpn6kvn0sj3hls5v03d6gr7j7d5phbj8p9bigb5cn";
};
preBuild=''
makeFlags="PREFIX=$out"
'';
patchPhase=''
tar -xf testsuite.tar
patchShebangs .
'';
doCheck = true;
checkTarget = "test";
buildInputs = [ perl ];
meta = with stdenv.lib; {
platforms = platforms.all;
maintainers = [ maintainers.urkud ];
};
}
pkgs/tools/misc/debootstrap/default.nix
+12 -9
View File
@@ -1,24 +1,29 @@
args: with args;
{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
let devices = fetchurl {
let
devices = fetchurl {
url = mirror://gentoo/distfiles/devices.tar.gz;
sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
};
in
stdenv.mkDerivation {
name = "debotstrap-1.0.10lenny";
name = "debootstrap-1.0.10lenny";
src = fetchurl {
# I'd like to use the source. However it's lacking the lanny script ?
url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
};
buildInputs = [dpkg gettext gawk perl];
buildInputs = [ dpkg gettext gawk perl ];
unpackPhase = ''
dpkg-deb --extract "$src" .
'';
buildPhase = ":";
patches = [
@@ -80,12 +85,10 @@ stdenv.mkDerivation {
*/
meta = {
description = "create a debian system in a chroot easily.";
longDescription = "this way you can use debian packages we don't have in nixpkgs yet.
";
description = "Tool to create a Debian system in a chroot";
homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
license = "GPL-2"; # gentoo says so.. ?
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/tools/misc/eProver/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
args: with args;
{ stdenv, fetchurl, which, texLive }:
stdenv.mkDerivation {
name = "EProver-0.999";
pkgs/tools/misc/figlet/default.nix
+7 -7
View File
@@ -1,22 +1,22 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "figlet-222";
# some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/
src = args.fetchurl {
src = fetchurl {
url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet222.tar.gz;
sha256 = "1y22hhwxhnwd6yrjgl5p3p44r22xzrhv9cksj58n85laac6jdfhs";
};
buildInputs =(with args; []);
preConfigure = ''
ensureDir $out/{man/man6,bin}
makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet"
'';
meta = {
description="program for making large letters out of ordinary text";
homepage = http://www.figlet.org/;
license = "AFL-2.1";
description = "Program for making large letters out of ordinary text";
homepage = http://www.figlet.org/;
license = "AFL-2.1";
};
}
pkgs/tools/misc/findutils-wrapper/builder.sh
-12
View File
@@ -1,12 +0,0 @@
source $stdenv/setup
source $makeWrapper
makeWrapper "$findutils/bin/locate" "$out/bin/locate" \
--set LOCATE_PATH /var/locatedb
makeWrapper "$findutils/bin/updatedb" "$out/bin/updatedb" \
--set LOCATE_DB /var/locatedb
makeWrapper "$findutils/bin/find" "$out/bin/find"
makeWrapper "$findutils/bin/xargs" "$out/bin/xargs"
pkgs/tools/misc/findutils-wrapper/default.nix
-10
View File
@@ -1,10 +0,0 @@
{stdenv, findutils}:
stdenv.mkDerivation {
name = findutils.name;
builder = ./builder.sh;
makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;
inherit findutils;
}
pkgs/tools/misc/fontforge/default.nix
+5 -7
View File
@@ -1,12 +1,13 @@
{ stdenv, fetchurl, gettext, freetype, zlib
, libungif, libpng, libjpeg, libtiff, libxml2
, withX11 ? false
, libX11 ? null, lib, xproto ? null, libXt ? null
}:
let
version = "20090408";
name = "fontforge-${version}";
in
in
stdenv.mkDerivation {
inherit name;
@@ -16,7 +17,7 @@ stdenv.mkDerivation {
sha256 = "1s9a1mgbr5sv5jx6rdj2v3p6s52hgjr9wqd1aq57kn9whc8ny8y4";
};
configureFlags = if libX11 != null then "--with-gui=gdraw" else "";
configureFlags = lib.optionalString withX11 "--with-gui=gdraw";
preConfigure = ''
unpackFile ${freetype.src}
@@ -30,9 +31,6 @@ stdenv.mkDerivation {
'';
buildInputs =
[gettext freetype zlib libungif libpng libjpeg libtiff libxml2]
++ lib.optional (libX11 != null) libX11
++ lib.optional (xproto != null) xproto
++ lib.optional (libXt != null) libXt
;
[ gettext freetype zlib libungif libpng libjpeg libtiff libxml2 ]
++ lib.optionals withX11 [ libX11 xproto libXt ];
}
pkgs/tools/misc/gparted/default.nix
+10 -6
View File
@@ -1,4 +1,6 @@
args: with args;
{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
, pkgconfig, gtkmm, gnomedocutils, libxml2 }:
stdenv.mkDerivation {
name = "gparted-0.5.1";
@@ -9,12 +11,14 @@ stdenv.mkDerivation {
configureFlags = "--disable-doc";
buildInputs = [parted gtk glib intltool gettext libuuid pkgconfig
gtkmm gnomedocutils libxml2];
buildInputs =
[ parted gtk glib intltool gettext libuuid pkgconfig gtkmm
gnomedocutils libxml2
];
meta = {
description = "gui partition tool";
homepage = http://gparted.sourceforge.net;
license = "GPLv2";
description = "Graphical disk partitioning tool";
homepage = http://gparted.sourceforge.net;
license = "GPLv2";
};
}
pkgs/tools/misc/grub/1.9x.nix
+25 -5
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, bison, ncurses, libusb, freetype }:
{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
let unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -7,14 +7,34 @@ let unifont_bdf = fetchurl {
in
stdenv.mkDerivation rec {
name = "grub-1.97.2";
name = "grub-1.98";
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
sha256 = "0j8wdaq9r0ayfsz25lbq2k3q0iasq5cyldlip8jyq2g87iid5hcq";
sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
};
buildInputs = [ bison ncurses libusb freetype ];
buildInputs = [ bison ncurses libusb freetype gettext ]
++ stdenv.lib.optional doCheck qemu;
preConfigure =
'' for i in "tests/util/"*.in
do
sed -i "$i" -e's|/bin/bash|/bin/sh|g'
done
# Apparently, the QEMU executable is no longer called
# `qemu-system-i386', even on i386.
#
# In addition, use `-nodefaults' to avoid errors like:
#
# chardev: opening backend "stdio" failed
# qemu: could not open serial device 'stdio': Invalid argument
#
# See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
sed -i "tests/util/grub-shell.in" \
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
'';
patches =
[ # The udev rules for LVM create symlinks in /dev/mapper rathe
@@ -32,7 +52,7 @@ stdenv.mkDerivation rec {
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
'';
doCheck = true;
doCheck = false;
meta = {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
pkgs/tools/misc/hddtemp/default.nix
+17 -14
View File
@@ -1,25 +1,28 @@
args: with args;
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "hddtemp-0.3-beta15";
db = fetchurl{
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
};
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;
sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya";
};
src = fetchurl {
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2;
sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1";
};
configurePhase = "
ensureDir \$out/nix-support
cp \$db \$out/nix-support/hddtemp.db
./configure --prefix=\$out --with-db-path=\$out/nix-support/hddtemp.db
";
configurePhase =
''
ensureDir $out/nix-support
cp $db $out/nix-support/hddtemp.db
./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db
'';
meta = {
description = "shows the harddisk temperature";
homepage = https://savannah.nongnu.org/projects/hddtemp/;
license = "GPL2";
description = "Tool for displaying hard disk temperature";
homepage = https://savannah.nongnu.org/projects/hddtemp/;
license = "GPL2";
};
}
pkgs/tools/misc/hdf5/bin-mv.patch
+30
View File
@@ -0,0 +1,30 @@
diff -rc hdf5-1.8.5/configure hdf5-1.8.5-new/configure
*** hdf5-1.8.5/configure 2010-06-04 20:26:04.000000000 +0200
--- hdf5-1.8.5-new/configure 2010-08-02 10:30:26.000000000 +0200
***************
*** 30587,30598 ****
sed 's/#define /#define H5_/' <src/H5config.h |\
sed 's/#undef /#undef H5_/' >pubconf
if test ! -f src/H5pubconf.h; then
! /bin/mv -f pubconf src/H5pubconf.h
elif (diff pubconf src/H5pubconf.h >/dev/null); then
rm -f pubconf
echo "src/H5pubconf.h is unchanged"
else
! /bin/mv -f pubconf src/H5pubconf.h
fi
echo "Post process src/libhdf5.settings"
sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
--- 30587,30598 ----
sed 's/#define /#define H5_/' <src/H5config.h |\
sed 's/#undef /#undef H5_/' >pubconf
if test ! -f src/H5pubconf.h; then
! mv -f pubconf src/H5pubconf.h
elif (diff pubconf src/H5pubconf.h >/dev/null); then
rm -f pubconf
echo "src/H5pubconf.h is unchanged"
else
! mv -f pubconf src/H5pubconf.h
fi
echo "Post process src/libhdf5.settings"
sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP
pkgs/tools/misc/hdf5/default.nix
+25
View File
@@ -0,0 +1,25 @@
{ stdenv
, fetchurl
}:
stdenv.mkDerivation {
name = "hdf5";
src = fetchurl {
url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.5.tar.gz ;
sha256 = "0nykbpxg154akgp6va6fkab7kjvybbvpsr7n7i1l8xxmv3h3hbsa";
};
buildInputs = [] ;
patches = [./bin-mv.patch];
meta = {
description = "HDF5 is a data model, library, and file format for storing and managing data.";
longDescription = ''
It supports an unlimited variety of datatypes, and is designed for flexible and efficient
I/O and for high volume and complex data. HDF5 is portable and is extensible, allowing
applications to evolve in their use of HDF5. The HDF5 Technology suite includes tools and
applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
'';
homepage = http://www.hdfgroup.org/HDF5/;
};
}
pkgs/tools/misc/idutils/default.nix
+6 -3
View File
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, emacs }:
stdenv.mkDerivation rec {
name = "idutils-4.2";
name = "idutils-4.5";
src = fetchurl {
url = "mirror://gnu/idutils/${name}.tar.gz";
sha256 = "16gsy7vrjax2zl4galwq03l0y97d18p0pyd5cccyc4i8y3mhwx65";
sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q";
};
buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.gnu.org/software/idutils/;
license = "GPLv2+";
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}
pkgs/tools/misc/idutils/nix-mapping.patch
+11 -9
View File
@@ -1,10 +1,12 @@
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
+
Recognize `.nix' files as text files.
--- idutils-4.5/libidu/id-lang.map 2009-05-17 16:38:42.000000000 +0200
+++ idutils-4.5/libidu/id-lang.map 2010-07-04 15:52:48.000000000 +0200
@@ -88,6 +88,7 @@ GNUmakefile make
*.doc text
*.txt text
*.org text
+*.nix text
*.m4 m4
*.ac m4
pkgs/tools/misc/keychain/default.nix
+12 -12
View File
@@ -1,24 +1,24 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "keychain-2.6.6";
src = args.fetchurl {
src = fetchurl {
url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2;
sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic";
};
phases = "unpackPhase buildPhase";
buildPhase ="
mkdir -p \$out/bin
cp keychain \$out/bin
";
buildInputs =(with args; []);
buildPhase =
''
mkdir -p $out/bin
cp keychain $out/bin
'';
meta = {
description = "tool starting ssh and gpg management tool";
homepage = "http://www.gentoo.org/proj/en/keychain/";
license = "GPL2";
description = "Keychain management tool";
homepage = "http://www.gentoo.org/proj/en/keychain/";
license = "GPL2";
};
}
pkgs/tools/misc/mysql2pgsql/default.nix
+8 -7
View File
@@ -1,16 +1,17 @@
args:
{ stdenv, fetchurl, perl, shebangfix }:
# The homepage says this script is mature..
args.stdenv.mkDerivation {
stdenv.mkDerivation {
name = "mysql2pgsql-0.0.1a";
src = args.fetchurl {
src = fetchurl {
url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz;
sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp";
};
phases = "unpackPhase installPhase";
buildInputs = with args; [ perl shebangfix ];
buildInputs = [ perl shebangfix ];
installPhase = ''
mkdir -p $out/bin;
@@ -20,8 +21,8 @@ args.stdenv.mkDerivation {
'';
meta = {
description = "converts mysql dump files to psql loadable files ";
homepage = http://pgfoundry.org/projects/mysql2pgsql/;
license = "GPL";
description = "converts mysql dump files to psql loadable files ";
homepage = http://pgfoundry.org/projects/mysql2pgsql/;
license = "GPL";
};
}
pkgs/tools/misc/parallel/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20100424";
name = "parallel-20100620";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0japyn4n044zpd88czsrfh4lyjmckih25jl671vby8v5mhk42vw4";
sha256 = "1hzdzvkm5cqciy6lhcbdzi4aar09fgsf0lfb4a89mnlq4xdmr8jj";
};
patchPhase =
pkgs/tools/misc/parted/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
, utillinuxng, xz }:
stdenv.mkDerivation rec {
name = "parted-2.2";
name = "parted-2.3";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
sha256 = "13gxq542lsm5jfq0kmrwgk4h61pcxy8s6rkqlw9qirqazsk9q9ik";
sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
};
buildInputs = [ xz libuuid gettext readline libuuid devicemapper ];
pkgs/tools/misc/partition-manager/default.nix
+5 -6
View File
@@ -1,4 +1,4 @@
args: with args; with kde;
{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt, kde, perl }:
stdenv.mkDerivation {
name = "partitionmanager-1.0.0";
@@ -8,8 +8,8 @@ stdenv.mkDerivation {
sha256 = "03ibn4vns7pa0ygkp2jh6zcdy106as5cc7p6rv1f5c15wxx0zsk1";
};
buildInputs = [cmake gettext parted libuuid
qt kdelibs kdebase automoc4 perl phonon];
buildInputs =
[ cmake gettext parted libuuid qt kde.kdelibs kde.kdebase kde.automoc4 perl kde.phonon ];
preConfigure = ''
export VERBOSE=1
@@ -25,10 +25,9 @@ stdenv.mkDerivation {
'';
meta = {
description = "utility program to help you manage the disk devices";
description = "Utility program to help you manage the disk devices";
homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ?
license = "GPL";
#maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/tools/misc/proxytunnel/default.nix
+9 -8
View File
@@ -1,19 +1,20 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl, openssl }:
stdenv.mkDerivation {
name = "proxytunnel-1.9.0";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz;
sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
};
buildInputs =(with args; [openssl]);
buildInputs = [ openssl ];
installPhase=''make DESTDIR="$out" PREFIX="" install'';
installPhase = ''make DESTDIR="$out" PREFIX="" install'';
meta = {
description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
homepage = http://proxytunnel.sourceforge.net/download.php;
license = "GPLv2";
description = "program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
homepage = http://proxytunnel.sourceforge.net/download.php;
license = "GPLv2";
};
}
pkgs/tools/misc/rlwrap/0.28.nix
-22
View File
@@ -1,22 +0,0 @@
args : with args; with builderDefs;
let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */
fetchurl {
url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;
sha256 = "07jzhcqzb8jsmsscc28dk4md7swnhn3vyai5fpxwdj6a1kbn4y3p";
};
buildInputs = [readline ];
configureFlags = [];
};
in with localDefs;
stdenv.mkDerivation rec {
name = "rlwrap-0.28";
builder = writeScript (name + "-builder")
(textClosure localDefs
[doConfigure doMakeInstall doForceShare doPropagate]);
meta = {
description = "Readline wrapper for console programs";
inherit src;
};
}
pkgs/tools/misc/rlwrap/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ stdenv, fetchurl, readline }:
stdenv.mkDerivation rec {
name = "rlwrap-0.37";
src = fetchurl {
url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz";
sha256 = "1gcb95i839pwn9a3phs2wq7bwz9f6v8sydq6lf9y4gm3hk0s40w4";
};
buildInputs = [ readline ];
meta = {
description = "Readline wrapper for console programs";
homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
};
}
pkgs/tools/misc/shebangfix/default.nix
+2 -1
View File
@@ -1,4 +1,5 @@
args: with args;
{ stdenv, perl }:
stdenv.mkDerivation {
name = "shebangfix-0.0";
pkgs/tools/misc/slsnif/default.nix
+7 -8
View File
@@ -1,17 +1,16 @@
args:
args.stdenv.mkDerivation {
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "slsnif-0.4.4";
src = args.fetchurl {
src = fetchurl {
url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz;
sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii";
};
buildInputs =(with args; []);
meta = {
description = "serial line sniffer";
homepage = http://slsnif.sourceforge.net/;
license = "GPLv2";
description = "Serial line sniffer";
homepage = http://slsnif.sourceforge.net/;
license = "GPLv2";
};
}
pkgs/tools/misc/timidity/default.nix
+6 -7
View File
@@ -1,6 +1,8 @@
args: with args;
let inherit (args.composableDerivation) composableDerivation edf; in
composableDerivation {} {
{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
let inherit (composableDerivation) edf; in
composableDerivation.composableDerivation {} {
name = "timidity-2.13.0";
@@ -9,8 +11,6 @@ composableDerivation {} {
sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
};
buildInputs = [];
mergeAttrBy.audioModes = a : b : "${a},${b}";
preConfigure = ''
@@ -57,7 +57,6 @@ composableDerivation {} {
meta = {
description = "A software MIDI renderer";
maintainers = [args.lib.maintainers.marcweber];
maintainers = [ stdenv.lib.maintainers.marcweber ];
};
}
pkgs/tools/misc/ttf2pt1/default.nix
+7 -5
View File
@@ -1,4 +1,5 @@
args: with args;
{ stdenv, fetchurl, perl, freetype }:
stdenv.mkDerivation {
name = "ttf2pt1-3.4.4";
@@ -17,12 +18,13 @@ stdenv.mkDerivation {
makeFlags="INSTDIR=$out OWNER=`id -u`"
'';
buildInputs = [freetype];
buildInputs = [ freetype ];
patches = ./gentoo-makefile.patch; # also contains the freetype patch
meta = {
description = "True Type to Postscript Type 3 converter, fpdf";
homepage = "http://ttf2pt1.sourceforge.net/index.html";
license = "ttf2pt1";
description = "True Type to Postscript Type 3 converter, fpdf";
homepage = "http://ttf2pt1.sourceforge.net/index.html";
license = "ttf2pt1";
};
}
pkgs/tools/misc/w3c-css-validator/default.nix
+13 -16
View File
@@ -1,11 +1,9 @@
args: with args;
{ stdenv, fetchurl, sourceFromHead, apacheAnt, tomcat, jre }:
let
inherit (args.stdenv) lib;
sources = [
(fetchurl {
sources =
[ (fetchurl {
name = "jigsaw_2.2.6.tar.gz";
url="http://jigsaw.w3.org/Distrib/jigsaw_2.2.6.tar.gz";
sha256 = "01cjpqjcs8gbvvzy0f488cb552f9b38hvwr97wydglrzndmcwypd";
@@ -20,7 +18,6 @@ let
url="http://www.apache.org/dist/commons/lang/binaries/commons-lang-2.4-bin.tar.gz";
sha256 = "0phwlgnvwj3n3j1aka2pkm0biacvgs72qc0ldir6s69i9qbv7rh0";
})
(fetchurl {
name = "velocity-1.6.1.tar.gz";
url="http://www.apache.org/dist/velocity/engine/1.6.1/velocity-1.6.1.tar.gz";
@@ -35,7 +32,7 @@ let
in
stdenv.mkDerivation {
stdenv.mkDerivation {
name = "w3c-css-validator";
# REGION AUTO UPDATE: { name="w3c-css-validator"; type="cvs"; cvsRoot=":pserver:anonymous:anonymous@dev.w3.org:/sources/public"; module="2002/css-validator"; }
@@ -43,14 +40,14 @@ stdenv.mkDerivation {
(fetchurl { url = "http://mawercer.de/~nix/repos/w3c-css-validator-F_17-52-37.tar.gz"; sha256 = "b6f05d4812eaa464906d101242689effa8b5516d32d6420315740a77d8ee11fd"; });
# END
buildInputs = [apacheAnt];
buildInputs = [ apacheAnt ];
# prepare target downloads dependency .tar.gz into tmp
# note: There is a .war as well which could be deployed to tomcat
installPhase = ''
cd css-validator
mkdir tmp
${ lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
${ stdenv.lib.concatStringsSep "\n" (map (src: "tar xfz ${src} -C tmp") sources) }
sed -i -e 's@<property name="servlet.lib" value=".*"/>@<property name="servlet.lib" value="${tomcat}/lib/servlet-api.jar"/>@' \
-e '/dest="tmp\//d' \
-e '/untar/d' \
@@ -68,12 +65,12 @@ stdenv.mkDerivation {
'';
meta = {
description = "w3c CSS validator";
homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
# dependencies ship their own license files
# I think all .java files are covered by this license (?)
license = "w3c"; # http://www.w3.org/Consortium/Legal/
maintainers = [args.lib.maintainers.marcweber];
platforms = args.lib.platforms.linux;
description = "W3C CSS validator";
homepage = http://dev.w3.org/cvsweb/2002/css-validator/;
# dependencies ship their own license files
# I think all .java files are covered by this license (?)
license = "w3c"; # http://www.w3.org/Consortium/Legal/
maintainers = [ stdenv.lib.maintainers.marcweber ];
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/tools/misc/wv/default.nix
+3 -2
View File
@@ -1,4 +1,5 @@
args: with args;
{ stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf
, libxml2, bzip2 }:
stdenv.mkDerivation {
name = "wv-1.2.4";
@@ -8,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
};
buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
buildInputs = [ zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2 ];
meta = {
description = "Converter from Microsoft Word formats to human-editable ones";
pkgs/tools/misc/xburst-tools/default.nix
+42
View File
@@ -0,0 +1,42 @@
{stdenv, fetchgit, libusb, autoconf, automake, confuse
, gccCross ? null}:
let
version = "2010-07-29";
in
stdenv.mkDerivation {
name = "xburst-tools-${version}";
src = fetchgit {
url = git://projects.qi-hardware.com/xburst-tools.git;
rev = "00be212db22643ad602eaf60b30eb943f119e78d";
sha256 = "66ea1a81b71bad599d76691f07a986f9bb2ccecf397e8486b661d8baace3460e";
};
prePatch = ''
find . -name Makefile* -exec sed -i \
-e s/mipsel-openwrt-linux-/mipsel-unknown-linux-/ {} \;
'';
patches = [ ./gcc-4.4.patch ];
preConfigure = ''
sh autogen.sh
'';
configureFlags = if gccCross != null then "--enable-firmware" else "";
# Not to strip cross build binaries (this is for the gcc-cross-wrapper)
dontCrossStrip = true;
buildInputs = [ libusb autoconf automake confuse ] ++
stdenv.lib.optional (gccCross != null) gccCross;
meta = {
description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
license = "GPLv3";
homepage = http://www.linux-mtd.infradead.org/;
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}
pkgs/tools/misc/xburst-tools/gcc-4.4.patch
+12
View File
@@ -0,0 +1,12 @@
diff --git a/xbboot/host-app/host_main.c b/xbboot/host-app/host_main.c
index 8835869..0d6fcc0 100644
--- a/xbboot/host-app/host_main.c
+++ b/xbboot/host-app/host_main.c
@@ -9,6 +9,7 @@
//
#include <stdio.h>
+#include <stdint.h>
#include <string.h>
#include <usb.h>
#include <time.h>
pkgs/tools/misc/xclip/default.nix
+6 -5
View File
@@ -1,4 +1,5 @@
args: with args;
{ stdenv, fetchurl, x11, libXmu }:
stdenv.mkDerivation {
name = "xclip-0.11";
@@ -7,11 +8,11 @@ stdenv.mkDerivation {
sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg";
};
buildInputs = [x11 libXmu];
buildInputs = [ x11 libXmu ];
meta = {
description = "access X clipboard from this console application";
homepage = http://people.debian.org/~kims/xclip/;
license = "GPL-2";
description = "Tool to access the X clipboard from a console application";
homepage = http://people.debian.org/~kims/xclip/;
license = "GPL-2";
};
}