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

* Sync with the trunk.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33971
This commit is contained in:
Eelco Dolstra
2012-05-02 13:19:07 +00:00
parent be901fa8be e0bd67afd7
commit 5bdea119d4
446 changed files with 4287 additions and 2692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/X11/xnee/default.nix
View File

@@ -2,11 +2,11 @@
, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }:
stdenv.mkDerivation rec {
name = "xnee-3.11";
name = "xnee-3.12";
src = fetchurl {
url = "mirror://gnu/xnee/${name}.tar.gz";
sha256 = "1x4frrf5ayslbkmr5cwll7psssxk11r4acnadp4qdvd218x50xrq";
sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw";
};
patchPhase =

9
pkgs/tools/archivers/gnutar/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "gnutar-1.26";
src = fetchurl {
@@ -32,4 +32,9 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ];
platforms = stdenv.lib.platforms.all;
};
}
}
# May have some issues with root compilation because the bootstrap tool
# cannot be used as a login shell for now.
// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux") {
FORCE_UNSAFE_CONFIGURE = 1;
})

4
pkgs/tools/cd-dvd/xorriso/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl }:
stdenv.mkDerivation rec {
name = "xorriso-1.1.8";
name = "xorriso-1.2.2";
src = fetchurl {
url = "mirror://gnu/xorriso/${name}.tar.gz";
sha256 = "1pnmjk2nvxg54zrm4mha6vvgi6sl5xzznqcfzrlrvgsdy5liwb4x";
sha256 = "0kw4fiqn24vya3zhay6minzrbz10zlxm8sjs272z7l5s2kwcjypx";
};
doCheck = true;

4
pkgs/tools/filesystems/e2fsprogs/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libuuid }:
stdenv.mkDerivation rec {
name = "e2fsprogs-1.42";
name = "e2fsprogs-1.42.2";
src = fetchurl {
url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
sha256 = "0ijabrxxmmna4y4wmy7d002nrzq1ifl98i71bl7fpqn3rsq6vd2m";
sha256 = "1gmq3h4hp4hz1zh8yznx9nb0p7yaykb52f7zkpsqbhjawg2zwdhx";
};
buildInputs = [ pkgconfig libuuid ];

22
pkgs/tools/graphics/graphviz/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, xlibs
, yacc, libtool, fontconfig, pango, gd, xlibs, gts
}:
stdenv.mkDerivation rec {
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
@@ -34,7 +34,19 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "A program for visualising graphs";
homepage = http://www.graphviz.org/;
homepage = "http://www.graphviz.org/";
description = "Open source graph visualization software";
longDescription = ''
Graphviz is open source graph visualization software. Graph
visualization is a way of representing structural information as
diagrams of abstract graphs and networks. It has important
applications in networking, bioinformatics, software engineering,
database and web design, machine learning, and in visual
interfaces for other technical domains.
'';
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
};
}

16
pkgs/tools/misc/dbacl/default.nix Normal file
View File

@@ -0,0 +1,16 @@
{fetchurl, stdenv}:
stdenv.mkDerivation rec {
name = "dbacl-1.14";
src = fetchurl {
url = "http://www.lbreyer.com/gpl/${name}.tar.gz";
md5 = "85bfd88bc20f326dc0f31e794948e21c";
};
meta = {
homepage = http://dbacl.sourceforge.net/;
longDescription = "a digramic Bayesian classifier for text recognition.";
maintainers = [ stdenv.lib.maintainers.garbas ];
license = stdenv.lib.licenses.gpl3;
};
}

17
pkgs/tools/misc/file/511.nix Normal file
View File

@@ -0,0 +1,17 @@
{stdenv, fetchurl, zlib}:
stdenv.mkDerivation rec {
name = "file-5.11";
buildInputs = [ zlib ];
src = fetchurl {
url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
sha256 = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7";
};
meta = {
description = "A program that shows the type of files";
homepage = "http://darwinsys.com/file";
};
}

11
pkgs/tools/misc/file/python.patch Normal file
View File

@@ -0,0 +1,11 @@
--- file-5.11/python/magic.py 2011-09-22 18:57:41.000000000 +0200
+++ file-5.11/python/magic.py.1 2012-04-30 15:00:31.750213810 +0200
@@ -13,7 +13,7 @@
Loads the shared library through ctypes and returns a library
L{ctypes.CDLL} instance
"""
- return ctypes.cdll.LoadLibrary(find_library('magic'))
+ return ctypes.CDLL('libmagic.so')
_libraries = {}
_libraries['magic'] = _init()

2
pkgs/tools/misc/fileschanged/default.nix
View File

@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
buildInputs = [ fam ];
patches = [./unused-variables.debian.patch];
doCheck = true;
meta = {

48
pkgs/tools/misc/fileschanged/unused-variables.debian.patch Normal file
View File

@@ -0,0 +1,48 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 07_unused_variables.dpatch by Colin Watson <cjwatson@ubuntu.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: GCC 4.6 warns about unused variables, and fileschanged builds with
## DP: -Werror, so deal with unused variable warnings.
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' fileschanged-0.6.5~/src/monitor.c fileschanged-0.6.5/src/monitor.c
--- fileschanged-0.6.5~/src/monitor.c 2006-04-19 20:42:29.000000000 +0100
+++ fileschanged-0.6.5/src/monitor.c 2011-09-14 01:17:23.000000000 +0100
@@ -84,6 +84,7 @@
retval = FAMMonitorDirectory (c, node->filename, &node->request,
(void *) node);
//printf ("FAMMonitorDirectory returns %d (reqnum %d)\n", retval, node->request.reqnum);
+ (void) retval;
}
else if (S_ISREG (node->statbuf.st_mode))
{
@@ -91,6 +92,7 @@
retval = FAMMonitorFile (c, node->filename, &node->request,
(void *) node);
//printf ("FAMMonitorFile returns %d (reqnum %d)\n", retval, node->request.reqnum);
+ (void) retval;
}
monitor_handle_events (c, list, 0, 30);
}
diff -r -U3 fileschanged-0.6.9-orig/src/main.c fileschanged-0.6.9/src/main.c
--- fileschanged-0.6.9-orig/src/main.c 2012-04-13 01:31:59.160601022 +0400
+++ fileschanged-0.6.9/src/main.c 2012-04-13 01:32:47.549599643 +0400
@@ -126,6 +126,7 @@
{
retval = process_file (filelist, filelist_len, arguments.args[i]);
}
+ (void) retval;
return 0;
}
@@ -168,6 +169,7 @@
if (fileptr != stdin)
fclose (fileptr);
+ (void) retval;
return 0;
}
int

8
pkgs/tools/misc/idutils/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, emacs }:
stdenv.mkDerivation rec {
name = "idutils-4.5";
name = "idutils-4.6";
src = fetchurl {
url = "mirror://gnu/idutils/${name}.tar.gz";
sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q";
url = "mirror://gnu/idutils/${name}.tar.xz";
sha256 = "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1";
};
buildInputs = stdenv.lib.optional stdenv.isLinux emacs;

10
pkgs/tools/misc/memtest86/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "memtest86+-4.20";
name = "memtest86-4.0a";
src = fetchurl {
url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
url = http://memtest86.com/memtest86-4.0a.tar.gz;
sha256 = "0d2n3nzyvna9k880zk6vl1z3b7wal1hrwcqay9vda8br7yp7634y";
};
preBuild = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
'';
meta = {
homepage = http://www.memtest.org/;
description = "A tool to detect memory errors";
homepage = http://memtest86.com/;
description = "A tool to detect memory errors, to be run from a bootloader";
};
}

31
pkgs/tools/misc/memtest86/plus.nix Normal file
View File

@@ -0,0 +1,31 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation {
name = "memtest86+-4.20";
src = fetchurl {
url = http://www.memtest.org/download/4.20/memtest86+-4.20.tar.gz;
sha256 = "0dw7kvfxiwqdmhapbz6ds1j9fralbky56hnzj4c6fsqfinbwwc2n";
};
preBuild = ''
# Really dirty hack to get Memtest to build without needing a Glibc
# with 32-bit libraries and headers.
if test "$system" = x86_64-linux; then
mkdir gnu
touch gnu/stubs-32.h
fi
'';
NIX_CFLAGS_COMPILE = "-I.";
installPhase = ''
mkdir -p $out
cp memtest.bin $out/
'';
meta = {
homepage = http://www.memtest.org/;
description = "A tool to detect memory errors, fork from memtest86";
};
}

4
pkgs/tools/misc/parallel/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, perl }:
stdenv.mkDerivation rec {
name = "parallel-20111222";
name = "parallel-20120322";
src = fetchurl {
url = "mirror://gnu/parallel/${name}.tar.bz2";
sha256 = "0rip8hnby1c2kcz7w7h6c2kf0y63hyw8bwprsd8fnqw96lgypf1b";
sha256 = "1nm3ljgaxh2rg2dfwpw9r31zs7k09ab9i14yvbm4wrqasa2bcrxj";
};
patchPhase =

4
pkgs/tools/misc/parted/default.nix
View File

@@ -2,11 +2,11 @@
, utillinux, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-3.0";
name = "parted-3.1";
src = fetchurl {
url = "mirror://gnu/parted/${name}.tar.xz";
sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a";
sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y";
};
buildInputs = [ libuuid ]

1
pkgs/tools/misc/ttf2pt1/default.nix
View File

@@ -19,6 +19,7 @@ stdenv.mkDerivation {
'';
buildInputs = [ freetype ];
buildNativeInputs = [ perl ];
patches = ./gentoo-makefile.patch; # also contains the freetype patch

48
pkgs/tools/networking/altermime/altermime.patch
View File

@@ -1,48 +0,0 @@
AUR patch for fixing build
diff -Naur altermime-0.3.10/qpe.c altermime-0.3.10-new/qpe.c
--- altermime-0.3.10/qpe.c 2008-11-16 09:45:45.000000000 +0100
+++ altermime-0.3.10-new/qpe.c 2010-11-24 14:28:43.153334114 +0100
@@ -97,7 +97,7 @@
op+= strlen(paragraph);// +3; /** jump the output + =\r\n **/
out_remaining-= (strlen(paragraph)); // Was +3, updated to fix Outlook problems
- QPD fprintf(stdout, "Soft break (%d + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
+ QPD fprintf(stdout, "Soft break (%zd + %d > 76 char) for '%s'\n", current_line_length, charout_size, paragraph);
/** reinitialize the paragraph **/
paragraph[0] = '\0';
@@ -108,7 +108,7 @@
}
snprintf(pp, pp_remaining, "%s", charout);
- QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%d result='%s'\n", charout, charout_size, pp_remaining, paragraph);
+ QPD fprintf(stdout,"charout='%s', size=%d, pp_remain=%zd result='%s'\n", charout, charout_size, pp_remaining, paragraph);
pp += charout_size;
pp_remaining -= charout_size;
p++;
@@ -149,13 +149,13 @@
out_size = in_size *3;
in_buffer = malloc( sizeof(char) *in_size +1);
if (in_buffer == NULL) {
- QPD fprintf(stdout,"Error allocating %d bytes for input buffer\n", in_size);
+ QPD fprintf(stdout,"Error allocating %zd bytes for input buffer\n", in_size);
return -1;
}
out_buffer = malloc( sizeof(char) *out_size *3 +1);
if (in_buffer == NULL) {
- QPD fprintf(stdout,"Error allocating %d bytes for output buffer\n", out_size);
+ QPD fprintf(stdout,"Error allocating %zd bytes for output buffer\n", out_size);
return -1;
}
@@ -169,7 +169,7 @@
** we segfault ;) **/
*(in_buffer +in_size) = '\0';
- QPD fprintf(stdout,"file %s is loaded, size = %d\n", fname, in_size);
+ QPD fprintf(stdout,"file %s is loaded, size = %zd\n", fname, in_size);
qp_encode( out_buffer, out_size, in_buffer, in_size );

18
pkgs/tools/networking/altermime/debian-patches.nix Normal file
View File

@@ -0,0 +1,18 @@
# Generated by debian-patches.sh from debian-patches.txt
let
prefix = "http://patch-tracker.debian.org/patch/series/dl/altermime/0.3.10-7";
in
[
{
url = "${prefix}/15_fix_snprintf.diff";
sha256 = "0fbi99s7pc2jvg9s2zldvg18i6g5ca3pcyaxy47kyabnz956dris";
}
{
url = "${prefix}/10_fix_printk_warnings.diff";
sha256 = "1fqsym07r3gv8zllg7c956g5a04gsxnr1ibbgkjr3yx6nm5ci1j7";
}
{
url = "${prefix}/20_fix-unused-but-set-variables.diff";
sha256 = "0ski67k44amrgg2g3gwdjzrlix2gjg60r5rs5wbjingvq1n7255r";
}
]

4
pkgs/tools/networking/altermime/debian-patches.txt Normal file
View File

@@ -0,0 +1,4 @@
altermime/0.3.10-7
15_fix_snprintf.diff
10_fix_printk_warnings.diff
20_fix-unused-but-set-variables.diff

2
pkgs/tools/networking/altermime/default.nix
View File

@@ -26,7 +26,7 @@ rec {
inherit (sourceInfo) name version;
inherit buildInputs;
patches = [./altermime.patch];
patches = map a.fetchurl (import ./debian-patches.nix);
phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
fixTarget = a.fullDepEntry (''

4
pkgs/tools/networking/dhcpcd/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "dhcpcd-5.5.4";
name = "dhcpcd-5.5.6";
src = fetchurl {
url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
sha256 = "1zhpm89s6bk29lx7hq5f6fqm7i6dq2wq9vv5m25rv5wv6747v0m6";
sha256 = "1rz8n6crw6yh9hzqwdqjpl37v60i1szr7dbhf6gvm374gpf10zv5";
};
configureFlags = "--sysconfdir=/etc";

5
pkgs/tools/networking/lsh/default.nix
View File

@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
s|/usr/bin/df|$(type -P df)|g ;
s|/usr/bin/ipcs|$(type -P ipcs)|g ;
s|/usr/bin/uptime|$(type -P uptime)|g"
# Skip the `configure' script that checks whether /dev/ptmx & co. work as
# expected, because it relies on impurities (for instance, /dev/pts may
# be unavailable in chroots.)
export lsh_cv_sys_unix98_ptys=yes
'';
buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ];

25
pkgs/tools/networking/mosh/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
, makeWrapper, perl }:
stdenv.mkDerivation rec {
name = "mosh-1.1.3";
src = fetchurl {
url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz";
sha256 = "1vkf7h8mcmfn9dgcwrww05mdijrl7321xv9wlhf7j99nwmklc8sk";
};
buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ];
postInstall = ''
wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
'';
meta = {
homepage = http://mosh.mit.edu/;
description = "Remote terminal application that allows roaming, local echo, etc.";
license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric];
platforms = with stdenv.lib.platforms; linux;
};
}

29
pkgs/tools/networking/ntop/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, fetchurl, autoconf, automake, libtool, wget, libpcap, gdbm, zlib, openssl, rrdtool
, python, geoip }:
stdenv.mkDerivation rec {
name = "ntop-4.1.0";
src = fetchurl {
url = "mirror://sourceforge/ntop/${name}.tar.gz";
sha256 = "19440gnswnqwvkbzpay9hzmnfnhbyc2ifpl2jri8dhcyhxima7n7";
};
preConfigure = ''
./autogen.sh
cp ${libtool}/share/aclocal/libtool.m4 libtool.m4.in
'';
buildNativeInputs = [ autoconf automake libtool wget libpcap gdbm zlib openssl rrdtool
python geoip ];
meta = {
description = "Traffic analysis with NetFlow and sFlow support";
license = "GLPv3+";
homepage = http://www.ntop.org/products/ntop/;
platforms = stdenv.lib.platforms.linux;
};
}

14
pkgs/tools/networking/offlineimap/default.nix
View File

@@ -1,18 +1,20 @@
{ fetchurl, buildPythonPackage }:
buildPythonPackage {
name = "offlineimap-6.2.0.2";
buildPythonPackage rec {
version = "6.5.3";
name = "offlineimap-${version}";
src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/o/offlineimap/offlineimap_6.2.0.2.orig.tar.gz";
sha256 = "1w69qv1dm37m53k8cd068lk5z3qjlscnjxr397gs8kdsfds67v7c";
url = "https://github.com/spaetz/offlineimap/tarball/v${version}";
name = "${name}.tar.bz";
sha256 = "8717a56e6244b47b908b23b598efb3470d74450ecd881b6d3573d8aec4a5db38";
};
doCheck = false;
meta = {
description = "IMAP to local files bridge";
homepage = "http://software.complete.org/software/projects/show/offlineimap";
description = "OfflineImap synchronizes emails between two repositories, so that you can read the same mailbox from multiple computers.";
homepage = "http://offlineimap.org";
license = "GPLv2+";
};
}

9
pkgs/tools/networking/openvpn/default.nix
View File

@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
--with-iproute-path=${iproute}/sbin/ip
'';
postInstall = ''
mkdir -p $out/share/doc/openvpn/examples
cp -r sample-config-files/ $out/share/doc/openvpn/examples
cp -r sample-keys/ $out/share/doc/openvpn/examples
cp -r easy-rsa/ $out/share/doc/openvpn/examples
rm -r $out/share/doc/openvpn/examples/easy-rsa/Windows
cp -r sample-scripts/ $out/share/doc/openvpn/examples
'';
meta = {
description="OpenVPN is a robust and highly flexible tunneling application compatible with many OSes.";
homepage="http://openvpn.net/";

4
pkgs/tools/networking/wicd/default.nix
View File

@@ -1,5 +1,5 @@
{stdenv, fetchurl, python, pygobject, pycairo, pyGtkGlade, pythonDBus,
wpa_supplicant, dhcp, wirelesstools, nettools, iproute,
wpa_supplicant, dhcp, dhcpcd, wirelesstools, nettools, iproute,
locale ? "C" }:
# Wicd has a ncurses interface that we do not build because it depends
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin:${wpa_supplicant}/sbin:${dhcpcd}/sbin:${dhcp}/sbin:${wirelesstools}/sbin:${nettools}/sbin:${iproute}/sbin" in/scripts=wicd.in
sed -i "3iexport PYTHONPATH=\$PYTHONPATH\$\{PYTHONPATH:+:\}$(toPythonPath $out):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pythonDBus})" in/scripts=wicd.in
sed -i "4iexport LC_ALL=\\\"${locale}\\\"" in/scripts=wicd.in
sed -i "2iexport PATH=\$PATH\$\{PATH:+:\}${python}/bin" in/scripts=wicd-client.in

19
pkgs/tools/package-management/cabal-install/0.14.0.nix Normal file
View File

@@ -0,0 +1,19 @@
{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
cabal.mkDerivation (self: {
pname = "cabal-install";
version = "0.14.0";
sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl";
isLibrary = false;
isExecutable = true;
buildDepends = [
Cabal filepath HTTP mtl network random time zlib
];
meta = {
homepage = "http://www.haskell.org/cabal/";
description = "The command-line interface for Cabal and Hackage";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

6
pkgs/tools/package-management/disnix/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, gettext, libiconv }:
stdenv.mkDerivation {
name = "disnix-0.3pre30527";
name = "disnix-0.3pre32254";
src = fetchurl {
url = http://hydra.nixos.org/build/1926928/download/4/disnix-0.3pre30527.tar.gz;
sha256 = "1mdcxyrz60nxcyn116i41nhh94r9hacvyilkjyjfiyf8d58pji1y";
url = http://hydra.nixos.org/build/2368541/download/4/disnix-0.3pre32254.tar.gz;
sha256 = "1jznx4mb6vwpzzpbk4c16j73hjgng7v1nraq8yya7f7m1s2gyhcw";
};
buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable ]

6
pkgs/tools/package-management/disnix/disnixos/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, disnix, socat, pkgconfig }:
stdenv.mkDerivation {
name = "disnixos-0.2pre31830";
name = "disnixos-0.2pre33586";
src = fetchurl {
url = http://hydra.nixos.org/build/1934498/download/3/disnixos-0.2pre31830.tar.gz;
sha256 = "02f2b4lk1gr24rqs56az82b3h3mnqrk1m48bcj21x109g4vrlpmm";
url = http://hydra.nixos.org/build/2368187/download/3/disnixos-0.2pre33586.tar.gz;
sha256 = "110vn4390447dws343py8ss6s8jizx8yg7yl38i64nlqh0bcn4ny";
};
buildInputs = [ socat pkgconfig disnix ];

6
pkgs/tools/package-management/nix/unstable.nix
View File

@@ -5,11 +5,11 @@
}:
stdenv.mkDerivation rec {
name = "nix-1.0pre2632_b8fb0ce";
name = "nix-1.0pre2668_46cdc6a";
src = fetchurl {
url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2";
sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da";
url = "http://hydra.nixos.org/build/2492261/download/4/${name}.tar.bz2";
sha256 = "d9a1cfbee1670bc700593d81211c47eb8d7623aa9699d18a414ecaddccabfa1a";
};
buildNativeInputs = [ perl pkgconfig ];

4
pkgs/tools/security/gnupg/default.nix
View File

@@ -13,11 +13,11 @@ assert useUsb -> (libusb != null);
assert useCurl -> (curl != null);
stdenv.mkDerivation rec {
name = "gnupg-2.0.18";
name = "gnupg-2.0.19";
src = fetchurl {
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
sha256 = "0nxf5nbgxi5splnw6xww5iy6sw367kz9x1cy5aaznhx45ivdvbj8";
sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg";
};
buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]

57
pkgs/tools/security/gnupg/git.nix Normal file
View File

@@ -0,0 +1,57 @@
# Remember to install Pinentry and
# 'echo "pinentry-program `which pinentry-gtk-2`" >> ~/.gnupg/gpg-agent.conf'.
{ fetchgit, stdenv, readline, zlib, libgpgerror, npth, libgcrypt, libassuan
, libksba, coreutils, autoconf, automake, transfig, ghostscript, texinfo
, useLdap ? true, openldap ? null, useBzip2 ? true, bzip2 ? null, useUsb ? true
, libusb ? null, useCurl ? true, curl ? null
}:
assert useLdap -> (openldap != null);
assert useBzip2 -> (bzip2 != null);
assert useUsb -> (libusb != null);
assert useCurl -> (curl != null);
stdenv.mkDerivation rec {
name = "gnupg-2.1pre-git20120407";
src = fetchgit {
url = "git://git.gnupg.org/gnupg.git";
rev = "f1e1387bee286c7434f0462185048872bcdb4484";
sha256 = "8f5a14587beccdd3752f9e430e56c6ea2d393dddb7843bfc17029e1a309045bb";
};
buildInputs = [ readline zlib libgpgerror npth libgcrypt libassuan libksba
autoconf automake transfig ghostscript texinfo ]
++ stdenv.lib.optional useLdap openldap
++ stdenv.lib.optional useBzip2 bzip2
++ stdenv.lib.optional useUsb libusb
++ stdenv.lib.optional useCurl curl;
patchPhase = ''
find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i
'';
preConfigure = "autoreconf -v";
configureFlags = "--enable-maintainer-mode";
meta = {
description = "GNU Privacy Guard (GnuPG), GNU Project's implementation of the OpenPGP standard";
longDescription = ''
GnuPG is the GNU project's complete and free implementation of
the OpenPGP standard as defined by RFC4880. GnuPG allows to
encrypt and sign your data and communication, features a
versatile key managment system as well as access modules for all
kind of public key directories. GnuPG, also known as GPG, is a
command line tool with features for easy integration with other
applications. A wealth of frontend applications and libraries
are available. Version 2 of GnuPG also provides support for
S/MIME.
'';
homepage = http://gnupg.org/;
license = "GPLv3+";
};
}

4
pkgs/tools/system/freeipmi/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, libgcrypt, readline }:
stdenv.mkDerivation rec {
name = "freeipmi-1.1.1";
name = "freeipmi-1.1.3";
src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz";
sha256 = "03q6wg1wdmr94dxh81lxllb53nmab0d637wgh2s1xn6rfmxf7ypf";
sha256 = "11kawxzk8cp9g3q5hdm1sqgzanprc2gagjdnm33lyz5df8xjfkmk";
};
buildInputs = [ libgcrypt readline ];

60
pkgs/tools/text/gnupatch/darwin-fix.patch Normal file
View File

@@ -0,0 +1,60 @@
Fix builds on Darwin:
http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html .
commit 2c4e3ecddec8a686bd50d238f4cefebb950298b7
Author: Andreas Gruenbacher <agruen@suse.de>
Date: Fri Jan 1 15:58:15 2010 +0100
* Makefile.in (LIBSRCS, LIBM4FILES): Add the missing files strnlen.c,
strnlen.m4, and safe-read.m4.
diff --git a/Makefile.in b/Makefile.in
index 3b3d78a..26dc281 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -91,6 +91,7 @@ LIBSRCS = \
gl/lib/stripslash.c \
gl/lib/strncasecmp.c \
gl/lib/strndup.c \
+ gl/lib/strnlen.c \
gl/lib/xmalloc.c \
gl/lib/xstrndup.c
Add the missing bits from Gnulib.
--- /dev/null 2012-04-23 08:54:35.747205543 +0200
+++ b/gl/lib/strnlen.c 2012-01-16 22:35:02.000000000 +0100
@@ -0,0 +1,31 @@
+/* Find the length of STRING, but scan at most MAXLEN characters.
+ Copyright (C) 2005-2007, 2009-2012 Free Software Foundation, Inc.
+ Written by Simon Josefsson.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+
+#include <config.h>
+
+#include <string.h>
+
+/* Find the length of STRING, but scan at most MAXLEN characters.
+ If no '\0' terminator is found in that many characters, return MAXLEN. */
+
+size_t
+strnlen (const char *string, size_t maxlen)
+{
+ const char *end = memchr (string, '\0', maxlen);
+ return end ? (size_t) (end - string) : maxlen;
+}

23
pkgs/tools/text/gnupatch/default.nix
View File

@@ -1,19 +1,12 @@
{ stdenv, fetchurl, ed }:
stdenv.mkDerivation rec {
stdenv.mkDerivation (rec {
name = "patch-2.6.1";
src =
if stdenv.isDarwin
then fetchurl {
# Temporary fix for
# http://lists.gnu.org/archive/html/bug-patch/2010-01/msg00004.html .
url = "ftp://alpha.gnu.org/gnu/patch/patch-2.6.1.87-94d8.tar.gz";
sha256 = "0jnw8p0nvkmwi1a2z56bssqik8fvkb71zd2cpzl1sklnrg1g3b6p";
} else fetchurl {
url = "mirror://gnu/patch/${name}.tar.gz";
sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
};
src = fetchurl {
url = "mirror://gnu/patch/${name}.tar.gz";
sha256 = "1fc1jyq80nswkf492fiqdbl2bhvlw2wb44ghqlfd3zngx4qkfmni";
};
buildInputs = (stdenv.lib.optional doCheck ed);
@@ -40,3 +33,9 @@ stdenv.mkDerivation rec {
platforms = stdenv.lib.platforms.all;
};
}
//
(stdenv.lib.optionalAttrs stdenv.isDarwin {
patches = [ ./darwin-fix.patch ];
}))

4
pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
View File

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
stdenv.mkDerivation {
name = "ec2-ami-tools-1.4.0.5";
name = "ec2-ami-tools-1.4.0.7";
buildInputs = [ unzip makeWrapper ];
src = fetchurl {
url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75";
sha256 = "0l8c623i1w30bh9k622cdjj5f57rlfc1zs0i01ya016ijyr08qip";
};
# Amazon EC2 requires that disk images are writable. If they're

4
pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, unzip, makeWrapper, jre }:
stdenv.mkDerivation {
name = "ec2-api-tools-1.4.4.2";
name = "ec2-api-tools-1.5.3.0";
src = fetchurl {
url = http://s3.amazonaws.com/ec2-downloads/ec2-api-tools.zip;
sha256 = "03immxrrc7brbwm9nbp6dqw4bxpcb18l8rsj75nd6h2vanq2qlj4";
sha256 = "0p0rk3bhk35b3dxdy8wjnbbj5zh1va63yfvdk5jxnzdzplds8v65";
};
buildInputs = [ unzip makeWrapper ];

30
pkgs/tools/virtualization/euca2ools/default.nix
View File

@@ -1,30 +1,16 @@
{ stdenv, fetchurl, which, pythonPackages }:
{ stdenv, fetchgit, which, pythonPackages }:
stdenv.mkDerivation rec {
name = "euca2ools-1.3.1";
pythonPackages.buildPythonPackage rec {
name = "euca2ools-2.0.0-pre-20111230";
namePrefix = "";
src = fetchurl {
url = "http://eucalyptussoftware.com/downloads/releases/${name}.tar.gz";
sha256 = "1k4hakbxqsv2gzcdrf6dbyrpnajcan9yilddhs47cg7lgqw7b41f";
src = fetchgit {
url = https://github.com/eucalyptus/euca2ools.git;
rev = "0032f7c85603f34b728a6f8bc6f25d7e4892432e";
sha256 = "ae3c3918d60411ebf15faefb6dc94e3a98ab73cf751d8180c52f51b19ed64c09";
};
makeFlags = "PREFIX=$(out)";
buildInputs = [ which pythonPackages.python pythonPackages.wrapPython ];
# We need boto 1.9 for now. See https://bugs.launchpad.net/euca2ools/devel/+bug/623888
pythonPath = [ pythonPackages.setuptools pythonPackages.boto_1_9 pythonPackages.m2crypto ];
preBuild =
''
substituteInPlace Makefile --replace "-o root" ""
substituteInPlace euca2ools/Makefile \
--replace 'python setup.py install' "python setup.py install --prefix=$out"
'';
postInstall = "wrapPythonPrograms";
pythonPath = [ pythonPackages.boto pythonPackages.m2crypto pythonPackages.ssl ];
meta = {
homepage = http://open.eucalyptus.com/downloads;