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

* Get rid of many instances of "args: with args;", and other coding

Browse Source 
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
This commit is contained in:
Eelco Dolstra
2010-07-28 11:55:54 +00:00
parent b4a3f99c78
commit 6609710409
132 changed files with 925 additions and 958 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/debootstrap/default.nix
+11 -8
View File
@@ -1,9 +1,12 @@
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 {
@@ -14,11 +17,13 @@ stdenv.mkDerivation {
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/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/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/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/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/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/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";