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

Merge from trunk up through r28790

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
This commit is contained in:
Shea Levy
2011-08-24 19:16:43 +00:00
parent 5d62c65d6e b58016b007
commit 4d70ba6cc9
2168 changed files with 42927 additions and 19027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/aws-mturk-clt/default.nix
+48
View File
@@ -0,0 +1,48 @@
{ stdenv, fetchurl, jre }:
stdenv.mkDerivation rec {
name = "aws-mturk-clt-1.3.0";
src = fetchurl {
url = "http://mturk.s3.amazonaws.com/CLTSource/${name}.tar.gz";
sha256 = "06p0cbb5afmqjjlibbw9gb08jp270c7j57lhnf9ld50sm1z021ln";
};
installPhase =
''
mkdir -p $out
cp -prvd bin $out/
for i in $out/bin/*.sh; do
sed -i "$i" -e "s|^MTURK_CMD_HOME=.*|MTURK_CMD_HOME=$out\nexport JAVA_HOME=${jre}|"
done
mkdir -p $out/lib
cp -prvd lib/* $out/lib/
''; # */
meta = {
homepage = https://requester.mturk.com/developer;
description = "Command line tools for interacting with the Amazon Mechanical Turk";
license = "unfree-redistributable";
longDescription =
''
The Amazon Mechanical Turk is a crowdsourcing marketplace that
allows users (“requesters”) to submit tasks to be performed by
other humans (“workers”) for a small fee. This package
contains command-line tools for submitting tasks, querying
results, and so on.
The command-line tools expect a file
<filename>mturk.properties<filename> in the current directory,
which should contain the following:
<screen>
access_key=[insert your access key here]
secret_key=[insert your secret key here]
service_url=http://mechanicalturk.amazonaws.com/?Service=AWSMechanicalTurkRequester
</screen>
'';
};
}
pkgs/tools/misc/bc/default.nix
+4
View File
@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
patches = [ ./readlinefix.patch ];
preConfigure = ''
sed -i 's/program.*save/static &/' bc/load.c
'';
configureFlags = [ "--with-readline" ];
buildInputs = [flex readline];
pkgs/tools/misc/convmv/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ perl ];
meta = with stdenv.lib; {
platforms = platforms.all;
platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
maintainers = [ maintainers.urkud ];
};
}
pkgs/tools/misc/coreutils/default.nix
+13 -4
View File
@@ -1,8 +1,11 @@
{ stdenv, fetchurl, aclSupport ? false, acl ? null, perl, gmp ? null}:
{ stdenv, fetchurl, perl, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null }:
assert aclSupport -> acl != null;
assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) );
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "coreutils-8.10";
src = fetchurl {
@@ -11,11 +14,16 @@ stdenv.mkDerivation rec {
};
buildNativeInputs = [ perl ];
buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl;
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux
++ stdenv.lib.optional selinuxSupport libsepol;
crossAttrs = {
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl.hostDrv
++ stdenv.lib.optional selinuxSupport libselinux.hostDrv
++ stdenv.lib.optional selinuxSupport libsepol.hostDrv
++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
stdenv.gccCross.libc.libiconv.hostDrv;
@@ -48,4 +56,5 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
};
}
} // (if selinuxSupport then { NIX_LDFLAGS = "-lsepol"; } else { } ) )
pkgs/tools/misc/dmg2img/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ stdenv, fetchurl, zlib, bzip2, openssl }:
stdenv.mkDerivation rec {
name = "dmg2img-1.6.2";
src = fetchurl {
url = "http://vu1tur.eu.org/tools/${name}.tar.gz";
sha256 = "1ibxjsrl9g877qi3jjpv0zdgl4x8j1vnd4y27q17a8my1jkhh5cg";
};
buildInputs = [zlib bzip2 openssl];
installPhase = ''
ensureDir $out/bin
cp dmg2img $out/bin
'';
}
pkgs/tools/misc/fdupes/default.nix
+12 -8
View File
@@ -1,16 +1,16 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "fdupes-1.40";
name = "fdupes-1.50-PR2";
src = fetchurl {
url = http://premium.caribe.net/~adrian2/programs/fdupes-1.40.tar.gz;
sha256 = "1ryxpckgrmqa4y7nx9a9xpg4z1r00k11kc1cm7lqv87l9g293vg1";
url = http://fdupes.googlecode.com/files/fdupes-1.50-PR2.tar.gz;
sha256 = "068nxcn3xilaphq53sywli9ndydy4gijfi2mz7h45kpy0q9cgwjs";
};
installPhase = ''
mkdir -p $out/{bin,man/man1}
make INSTALLDIR=$out/bin MANPAGEDIR=$out/man install
'';
# workaround: otherwise make install fails (should be fixed in trunk)
preInstall = "ensureDir $out/bin $out/man/man1";
makeFlags = "PREFIX=\${out}";
meta = {
description = "identifies duplicate files residing within specified directories.";
@@ -18,7 +18,11 @@ stdenv.mkDerivation {
FDUPES uses md5sums and then a byte by byte comparison to finde duplicate
files within a set of directories.
'';
homepage = http://premium.caribe.net/~adrian2/fdupes.html;
homepage = http://code.google.com/p/fdupes/;
license = "MIT";
platforms = stdenv.lib.platforms.all;
maintainers = [
stdenv.lib.maintainers.z77z
];
};
}
pkgs/tools/misc/file/default.nix
+4 -3
View File
@@ -1,10 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "file-5.03";
name = "file-5.04";
src = fetchurl {
url = ftp://ftp.astron.com/pub/file/file-5.03.tar.gz;
sha256 = "1fwmpplwc6h2g89ribq7w8x2np0yn5k7bw042815rv7jkrzv9nhy";
url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz;
sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc";
};
meta = {
pkgs/tools/misc/gnokii/default.nix
+3 -13
View File
@@ -5,7 +5,8 @@ let
s = import ./src-for-default.nix;
buildInputs = with a; [
perl intltool gettext libusb
glib pkgconfig
glib gtk pkgconfig bluez readline
libXpm pcsclite libical
];
in
@@ -18,19 +19,8 @@ rec {
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = [ "setDebug" "doConfigure" "doMakeInstall"];
phaseNames = [ "doConfigure" "doMakeInstall"];
setDebug = a.fullDepEntry ''
mkdir -p $out/src
cp -R * $out/src
cd $out/src
export NIX_STRIP_DEBUG=0
export CFLAGS="-ggdb -O0 -include ${a.stdenv.glibc}/include/locale.h"
export CXXFLAGS="-ggdb -O0"
'' [ "minInit" "doUnpack" ];
inherit(s) name;
meta = {
description = "Cellphone tool";
pkgs/tools/misc/gnokii/src-for-default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
rec {
version="0.6.29";
name="gnokii-0.6.29";
hash="0w94balyy9l0xy8x3z20f127b5ijpm9a9fbbskz147jyzhprgw0l";
version="0.6.30";
name="gnokii-0.6.30";
hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p";
url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.gz";
advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz";
}
pkgs/tools/misc/gparted/default.nix
+4 -3
View File
@@ -2,11 +2,11 @@
, pkgconfig, gtkmm, gnomedocutils, libxml2 }:
stdenv.mkDerivation {
name = "gparted-0.5.1";
name = "gparted-0.8.1";
src = fetchurl {
url = mirror://sourceforge/gparted/gparted-0.5.1/gparted-0.5.1.tar.bz2;
sha256 = "1mqi1hxv6bahp771bqld0a6wx7khdxvz353n47q1wmqykmn4wbp0";
url = mirror://sourceforge/gparted/gparted-0.5.1/gparted-0.8.1.tar.bz2;
sha256 = "128pnrcqp3d4a4jnjxm0mqglbyrs2q841pmg5g8ilyc827b6j163";
};
configureFlags = "--disable-doc";
@@ -20,5 +20,6 @@ stdenv.mkDerivation {
description = "Graphical disk partitioning tool";
homepage = http://gparted.sourceforge.net;
license = "GPLv2";
platforms = with stdenv.lib.platforms; linux;
};
}
pkgs/tools/misc/grub/1.98.nix
+79
View File
@@ -0,0 +1,79 @@
{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
let unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
in
stdenv.mkDerivation rec {
name = "grub-1.98";
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
};
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
# than device nodes, causing GRUB to fail to recognize LVM
# volumes. See
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
# This ugly workaround makes `find_root_device' use stat() on
# files in /dev/mapper instead of lstat().
./device-mapper-symlinks.patch
];
postPatch =
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
sed -i "configure" \
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
'';
doCheck = true;
meta = {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
longDescription =
'' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
Unified Bootloader, which was originally designed and implemented by
Erich Stefan Boleyn.
Briefly, the boot loader is the first software program that runs when a
computer starts. It is responsible for loading and transferring
control to the operating system kernel software (such as the Hurd or
the Linux). The kernel, in turn, initializes the rest of the
operating system (e.g., GNU).
'';
homepage = http://www.gnu.org/software/grub/;
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.gnu;
};
}
pkgs/tools/misc/grub/1.9x.nix
+22 -18
View File
@@ -1,20 +1,25 @@
{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
{ fetchurl, stdenv, xz, flex, bison, gettext, ncurses, libusb, freetype, qemu
, EFIsupport ? false }:
let unifont_bdf = fetchurl {
let
prefix = "grub${if EFIsupport then "-efi" else ""}";
version = "1.99";
unifont_bdf = fetchurl {
url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
};
in
stdenv.mkDerivation rec {
name = "grub-1.98";
name = "${prefix}-${version}";
src = fetchurl {
url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
url = "mirror://gnu/grub/grub-${version}.tar.xz";
sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
};
buildInputs = [ bison ncurses libusb freetype gettext ]
buildNativeInputs = [ xz flex bison ];
buildInputs = [ ncurses libusb freetype gettext ]
++ stdenv.lib.optional doCheck qemu;
preConfigure =
@@ -36,26 +41,25 @@ stdenv.mkDerivation rec {
-e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
'';
patches =
[ # The udev rules for LVM create symlinks in /dev/mapper rathe
# than device nodes, causing GRUB to fail to recognize LVM
# volumes. See
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
# This ugly workaround makes `find_root_device' use stat() on
# files in /dev/mapper instead of lstat().
./device-mapper-symlinks.patch
];
postPatch =
prePatch =
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
sed -i "configure" \
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
'';
configureFlags =
let arch = if stdenv.system == "i686-linux" then "i386"
else if stdenv.system == "x86_64-linux" then "x86_64"
else throw "unsupported EFI firmware architecture";
in
stdenv.lib.optionals EFIsupport
[ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ];
doCheck = false;
enableParallelBuilding = true;
meta = {
description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)";
longDescription =
'' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
pkgs/tools/misc/heimdall/default.nix
+57
View File
@@ -0,0 +1,57 @@
{ stdenv, fetchgit, pkgconfig, libusb1, udev
, enableGUI ? true, qt4 ? null
}:
stdenv.mkDerivation {
name = "heimdall-1.3.0";
src = fetchgit {
url = git://github.com/Benjamin-Dobell/Heimdall.git;
rev = "ed9b08e5d9e3db60d52bccf6cb6919fb4bd47602";
sha256 = "e65f18299a05699595548cb27393a01b4e1dbbced82d4add8d0d55ef6514a691";
};
buildInputs =
[ pkgconfig libusb1 udev ]
++ stdenv.lib.optional enableGUI qt4 ;
makeFlags = "udevrulesdir=$(out)/lib/udev/rules.d";
preConfigure =
''
pushd libpit
./configure
make
popd
cd heimdall
substituteInPlace Makefile.in --replace sudo true
# Give ownership of the Galaxy S USB device to the logged in
# user.
substituteInPlace 60-heimdall-galaxy-s.rules --replace 'MODE="0666"' 'TAG+="udev-acl"'
'';
postBuild = stdenv.lib.optionalString enableGUI
''
pushd ../heimdall-frontend
substituteInPlace Source/mainwindow.cpp --replace /usr/bin $out/bin
qmake heimdall-frontend.pro OUTPUTDIR=$out/bin
make
popd
'';
postInstall =
''
mkdir -p $out/share/doc/heimdall
cp ../Linux/README $out/share/doc/heimdall/
'' + stdenv.lib.optionalString enableGUI ''
make -C ../heimdall-frontend install
'';
meta = {
homepage = http://www.glassechidna.com.au/products/heimdall/;
description = "A cross-platform open-source tool suite used to flash firmware onto Samsung Galaxy S devices";
license = "bsd";
};
}
pkgs/tools/misc/ised/default.nix
+47
View File
@@ -0,0 +1,47 @@
x@{builderDefsPackage
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="ised";
version="2.2.2";
name="${baseName}-${version}";
url="mirror://sf/project/ised/${name}.tar.bz2";
hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "A numeric sequence editor";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.gpl3Plus;
};
passthru = {
updateInfo = {
downloadPage = "ised.sf.net";
};
};
}) x
pkgs/tools/misc/keychain/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "keychain-2.6.6";
name = "keychain-2.7.1";
src = fetchurl {
url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2;
sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic";
url = mirror://gentoo/distfiles/keychain-2.7.1.tar.bz2;
sha256 = "14ai6wjwnj09xnl81ar2dlr5kwb8y1k5ck6nc549shpng0zzw1qi";
};
phases = "unpackPhase buildPhase";
pkgs/tools/misc/mc/default.nix
+10 -56
View File
@@ -1,66 +1,20 @@
{ stdenv, fetchurl, lib, pkgconfig, glib, ncurses, e2fsprogs, gpm
, libX11, libXt, shebangfix, perl, zip, unzip, gettext, slang}:
{ stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs
, libX11, libICE, perl, zip, unzip, gettext, slang}:
stdenv.mkDerivation rec {
name = "mc-4.6.1";
name = "mc-4.7.5.3";
src = fetchurl {
url = "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/${name}.tar.gz";
sha256 = "0zly25mwdn84s0wqx9mzyqi177mm828716nv1n6a4a5cm8yv0sh8";
url = http://www.midnight-commander.org/downloads/mc-4.7.5.3.tar.bz2;
sha256 = "1di8fsdg6y98iq3846j145qjk4bf5rgjj2hxnxdbcwfp8p3v8x88";
};
buildInputs = [pkgconfig glib ncurses libX11 libXt
shebangfix perl zip unzip slang gettext e2fsprogs gpm];
# Fix the paths to the terminfo files. Otherwise mc has no colors
preConfigure = ''
sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
'';
configureFlags = "--enable-charset";
# Stole some patches from LFS which fix some nasty bugs
patches = [ ./mc-4.6.1-bash32-1.patch ./mc-4.6.1-debian_fixes-1.patch ];
# Required to enable the Debian UTF8 fixes
CPPFLAGS = "-DUTF8";
# The Debian UTF8 patch expects that the documentation is in UTF8 format,
# therefore we have to convert them (I stole this also from LFS)
postBuildPhase = ''
for file in lib/mc.hint{,.es,.it,.nl} doc/{es,it}/mc.hlp.*
do
iconv -f ISO-8859-1 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in lib/mc.hint{.cs,.hu,.pl} doc/{hu,pl}/mc.hlp.*
do
iconv -f ISO-8859-2 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in lib/mc.hint.sr doc/sr/mc.hlp.sr
do
iconv -f ISO-8859-5 -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
for file in doc/ru/mc.hlp.ru lib/mc.hint.ru
do
iconv -f KOI8-R -t UTF-8 $file > $file.utf8 &&
mv $file.utf8 $file
done &&
buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ];
iconv -f KOI8-U -t UTF-8 lib/mc.hint.uk > lib/mc.hint.uk.utf8 &&
mv lib/mc.hint.uk.utf8 lib/mc.hint.uk &&
iconv -f BIG5 -t UTF-8 lib/mc.hint.zh > lib/mc.hint.zh.utf8 &&
mv lib/mc.hint.zh.utf8 lib/mc.hint.zh
# foo
'';
makeFlags = "UNZIP=unzip";
postInstall = ''
find $out -iname "*.pl" | xargs shebangfix;
'';
meta = {
description = "File Manager and User Shell for the GNU Project";
homepage = http://www.ibiblio.org/mc;
maintainers = [ lib.maintainers.sander ];
homepage = http://www.midnight-commander.org;
license = "GPLv2+";
maintainers = [ stdenv.lib.maintainers.sander ];
};
}
pkgs/tools/misc/memtest86/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "memtest86+-4.10";
name = "memtest86+-4.20";
src = fetchurl {
url = http://www.memtest.org/download/4.10/memtest86+-4.10.tar.gz;
sha256 = "0kxa2m7vfcm543wp53fv16sjjf5p12mzdz5rm87mrrr6hw43a6gq";
url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
};
preBuild = ''
pkgs/tools/misc/myhasktags/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{fetchurl, stdenv, ghcReal} :
{fetchurl, stdenv, ghcPlain} :
/* use case:
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
ensureDir $out/bin
ghc --make $src -o $out/bin/hasktags-modified
'';
buildInputs = [ ghcReal ];
buildInputs = [ ghcPlain ];
meta = {
description = "my patched version of hasktags. Should be merged into hasktags?";
pkgs/tools/misc/parallel/default.nix
+6 -3
View File
@@ -1,17 +1,20 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20101202";
name = "parallel-20110822";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "156jnsf9dhmbi7r207fns2vphpnjdrbz5ndkp8m6d8b1p2qfj46i";
sha256 = "0ryj97b9w2mzvmnqhkh384s59v62gf0vlyj8qphiy34505x5pznb";
};
patchPhase =
'' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
'';
rm -vf src/sem
preBuild =
# The `sem' program wants to write to `~/.parallel'.
'' export HOME="$PWD"
'';
buildInputs = [ perl ];
pkgs/tools/misc/parted/2.3.nix
+57
View File
@@ -0,0 +1,57 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinuxng, xz, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-2.3";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
};
buildNativeInputs = [ xz ];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (devicemapper != null) devicemapper
++ stdenv.lib.optional (hurd != null) hurd;
configureFlags =
(if (readline != null)
then [ "--with-readline" ]
else [ "--without-readline" ])
++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper"
++ stdenv.lib.optional enableStatic "--enable-static";
doCheck = true;
preCheck =
stdenv.lib.optionalString doCheck
# The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
"export PATH=\"${utillinuxng}/sbin:$PATH\"";
meta = {
description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";
longDescription = ''
GNU Parted is an industrial-strength package for creating, destroying,
resizing, checking and copying partitions, and the file systems on
them. This is useful for creating space for new operating systems,
reorganising disk usage, copying data on hard disks and disk imaging.
It contains a library, libparted, and a command-line frontend, parted,
which also serves as a sample implementation and script backend.
'';
homepage = http://www.gnu.org/software/parted/;
license = "GPLv3+";
maintainers = [
# Add your name here!
stdenv.lib.maintainers.ludo
];
# GNU Parted requires libuuid, which is part of util-linux-ng.
platforms = stdenv.lib.platforms.linux;
};
}
pkgs/tools/misc/parted/default.nix
+5 -4
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinuxng, xz, enableStatic ? false, hurd ? null }:
, utillinuxng, xz, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-2.3";
name = "parted-3.0";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a";
};
buildNativeInputs = [ xz ];
@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext
++ stdenv.lib.optional (devicemapper != null) devicemapper
++ stdenv.lib.optional (hurd != null) hurd;
++ stdenv.lib.optional (hurd != null) hurd
++ stdenv.lib.optional doCheck check;
configureFlags =
(if (readline != null)
pkgs/tools/misc/partition-manager/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kdebase,
{ stdenv, fetchurl, cmake, gettext, parted, libuuid, qt4, kdelibs, kde_baseapps,
automoc4, phonon, perl }:
stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs =
[ cmake gettext parted libuuid qt4 kdelibs kdebase automoc4 perl phonon ];
[ cmake gettext parted libuuid qt4 kdelibs kde_baseapps automoc4 perl phonon ];
preConfigure = ''
export VERBOSE=1
pkgs/tools/misc/pinentry/default.nix
-31
View File
@@ -1,31 +0,0 @@
{ fetchurl, stdenv, pkgconfig, glib
, useGtk ? true, gtk ? null
, useNcurses ? true, ncurses ? null
, useQt4 ? false, qt4 ? null }:
assert useGtk -> (gtk != null);
assert useNcurses -> (ncurses != null);
assert useQt4 -> (qt4 != null);
stdenv.mkDerivation rec {
name = "pinentry-0.8.0";
src = fetchurl {
url = "mirror://gnupg/pinentry/${name}.tar.gz";
sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22";
};
buildInputs = [ glib pkgconfig gtk ncurses ] ++ stdenv.lib.optional useQt4 qt4;
meta = {
description = "GnuPG's interface to passphrase input";
longDescription = ''
Pinentry provides a console and a GTK+ GUI that allows users to
enter a passphrase when `gpg' or `gpg2' is run and needs it.
'';
homepage = http://gnupg.org/aegypten2/;
license = "GPLv2+";
};
}
pkgs/tools/misc/pinentry/duplicate-glib-defs.patch
-20
View File
@@ -1,20 +0,0 @@
Comment out definitions of functions that are part of Glib.
--- pinentry-0.7.5/gtk+-2/gtksecentry.c 2007-11-19 12:20:50.000000000 +0100
+++ pinentry-0.7.5/gtk+-2/gtksecentry.c 2008-12-08 22:08:22.000000000 +0100
@@ -269,6 +269,7 @@ gboolean g_use_secure_mem = FALSE;
} while(0)
+#if 0
gpointer
g_malloc(gulong size)
{
@@ -347,6 +348,7 @@ g_free(gpointer mem)
free(mem);
}
}
+#endif
GType
gtk_secure_entry_get_type(void)
pkgs/tools/misc/pv/default.nix
+5 -3
View File
@@ -1,16 +1,18 @@
{ stdenv, fetchurl } :
stdenv.mkDerivation {
name = "pv-1.1.4";
name = "pv-1.2.0";
src = fetchurl {
url = http://pipeviewer.googlecode.com/files/pv-1.1.4.tar.bz2;
sha256 = "c8613c240ab4297f6ad346f0047138f551a093c603eeb581d5e83091cad3a559";
url = http://pipeviewer.googlecode.com/files/pv-1.2.0.tar.bz2;
sha256 = "0rn6rpiw7c16pgkhcslax9p1mxkxkmk6ivc9hjmsis7r69niyag3";
};
meta = {
homepage = http://www.ivarch.com/programs/pv;
description = "Tool for monitoring the progress of data through a pipeline";
license = "free";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; all;
};
}
pkgs/tools/misc/recutils/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, gettext, emacs, curl, check, bc }:
stdenv.mkDerivation rec {
name = "recutils-1.0";
name = "recutils-1.3";
src = fetchurl {
url = "mirror://gnu/recutils/${name}.tar.gz";
sha256 = "1m8ir31wjybm9x8bv73f330kb2hkmc8lrpwgd5h9avva4x5b7g5d";
sha256 = "0ywf939vw4zbpq6dmvw656fhkx8izma99pr1akzh8hs2rc9sp2pr";
};
doCheck = true;
pkgs/tools/misc/rockbox-utility/default.nix
+31
View File
@@ -0,0 +1,31 @@
{ stdenv, fetchurl, libusb, qt4 }:
stdenv.mkDerivation rec {
name = "rockbox-utility-${version}";
version = "1.2.8";
src = fetchurl {
url = "http://download.rockbox.org/rbutil/source/rbutil_${version}-src.tar.bz2";
sha256 = "1gjwlyrwvzfdhqdwvq1chdnjkcn9lk21ixp92h5y74826j3ahdgs";
};
buildInputs = [ libusb qt4 ];
preBuild = ''
cd rbutil/rbutilqt
qmake
'';
installPhase = ''
ensureDir $out/bin
cp RockboxUtility $out/bin
'';
meta = with stdenv.lib; {
description = "open source firmware for mp3 players";
homepage = http://www.rockbox.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}
pkgs/tools/misc/rrdtool/default.nix
+3 -3
View File
@@ -1,10 +1,10 @@
{ fetchurl, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo }:
stdenv.mkDerivation {
name = "rrdtool-1.3.6";
name = "rrdtool-1.4.5";
src = fetchurl {
url = http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.3.6.tar.gz;
sha256 = "e958760cb0d182c53a878cb2ba5c290c252c2c506082c988e5dd3f3301b895a2";
url = http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz;
sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj";
};
buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ];
pkgs/tools/misc/syslog-ng/default.nix
-22
View File
@@ -1,22 +0,0 @@
{stdenv, fetchurl, eventlog, pkgconfig, glib}:
stdenv.mkDerivation {
name = "syslog-ng-3.1.2";
src = fetchurl {
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.1.2/source/syslog-ng_3.1.2.tar.gz";
sha256 = "0a508l4j11336jn5kg65l70rf7xbpdxi2n477rvp5p48cc1adcg2";
};
buildInputs = [eventlog pkgconfig glib];
configureFlags = "--enable-dynamic-linking";
meta = {
homepage = "http://www.balabit.com/network-security/syslog-ng/";
description = "Next-generation syslogd with advanced networking and filtering capabilities.";
license = "GPLv2";
platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}
pkgs/tools/misc/system-config-printer/default.nix
+26 -13
View File
@@ -1,27 +1,40 @@
{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
notify }:
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, xz, pythonPackages
, withGUI ? true
}:
stdenv.mkDerivation rec {
name = "${meta.name}-${meta.version}";
src = fetchurl {
url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2";
sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz";
sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw";
};
buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
pygtk pythonDBus pycups notify ];
buildInputs =
[ xz intltool pkgconfig glib udev libusb cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
];
pythonPath =
[ pythonDBus pycups pygobject ]
++ stdenv.lib.optionals withGUI [ pygtk pythonPackages.notify ];
configureFlags = "--with-udev-rules";
postInstall = ''
wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
'';
postInstall =
''
wrapPythonPrograms
( cd $out/share/system-config-printer/troubleshoot
mv .__init__.py-wrapped __init__.py
)
'';
meta = {
name = "system-config-printer";
version = "1.2.4";
version = "1.3.4";
};
}
pkgs/tools/misc/vfdecrypt/default.nix
+16
View File
@@ -0,0 +1,16 @@
{ stdenv, fetchgit, openssl }:
stdenv.mkDerivation rec {
name = "vfdecrypt";
src = fetchgit {
url = git://github.com/dra1nerdrake/VFDecrypt.git;
rev = "4e2fa32816254907e82886b936afcae9859a876c";
sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3";
};
buildInputs = [openssl];
installPhase = ''
ensureDir $out/bin
cp vfdecrypt $out/bin
'';
}
pkgs/tools/misc/vorbisgain/default.nix
+17
View File
@@ -0,0 +1,17 @@
{ stdenv, fetchurl, unzip, libogg, libvorbis }:
stdenv.mkDerivation rec {
name = "vorbisgain-0.34";
src = fetchurl {
url = "http://sjeng.org/ftp/vorbis/${name}.zip";
sha256 = "1sjxl20ahhjv63b8a99sq9p14vz3lf1gacivkk0x2c11cc9zw4nr";
};
buildInputs = [ unzip libogg libvorbis ];
patchPhase = ''
chmod -v +x configure
sed -e 's/^ /\t/' -i Makefile.*
configureFlags="--mandir=$out/share/man"
'';
}
pkgs/tools/misc/xburst-tools/default.nix
+6 -11
View File
@@ -2,29 +2,24 @@
, gccCross ? null }:
let
version = "2010-07-29";
version = "2011-03-08";
in
stdenv.mkDerivation {
name = "xburst-tools-${version}";
src = fetchgit {
url = git://projects.qi-hardware.com/xburst-tools.git;
rev = "00be212db22643ad602eaf60b30eb943f119e78d";
sha256 = "66ea1a81b71bad599d76691f07a986f9bb2ccecf397e8486b661d8baace3460e";
rev = "a3a38cabf1e854667d90f49f0b4487e28974a3a6";
sha256 = "ac5671708cf9d18de79207530335f6781fa4bedf55288069786f4ecb971c4658";
};
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 "";
configureFlags = if gccCross != null then
"--enable-firmware CROSS_COMPILE=${gccCross.crossConfig}-"
else "";
# Not to strip cross build binaries (this is for the gcc-cross-wrapper)
dontCrossStrip = true;
pkgs/tools/misc/xburst-tools/gcc-4.4.patch
-12
View File
@@ -1,12 +0,0 @@
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/xdaliclock/default.nix
+56
View File
@@ -0,0 +1,56 @@
x@{builderDefsPackage
, libX11, xproto, libXt, libICE
, libSM, libXext
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="xdaliclock";
version="2.35";
name="${baseName}-${version}";
project="${baseName}";
url="http://www.jwz.org/${project}/${name}.tar.gz";
hash="0iybha2d0wqb4wkpw7l1zi3zhw57kqh3y7p4ja1k0fmvrzqc08g7";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];
prepareDirs = a.fullDepEntry ''
ensureDir "$out/bin" "$out/share" "$out/share/man/man1"
'' ["minInit" "defEnsureDir"];
goSrcDir = "cd X11";
meta = {
description = "A clock application that morphs digits when they are changed";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux ++ freebsd;
license = "free";
};
passthru = {
updateInfo = {
downloadPage = "http://www.jwz.org/xdaliclock/";
};
};
}) x