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

Merge branch 'master' into systemd

Browse Source
This commit is contained in:
Eelco Dolstra
2013-01-15 12:11:07 +01:00
parent ee19b41203 76d8b3a530
commit eeda226b02
117 changed files with 978 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, libuuid }:
stdenv.mkDerivation rec {
name = "jfsutils-1.1.12";
name = "jfsutils-1.1.15";
src = fetchurl {
url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz";
sha256 = "04vqdlg90j0mk5jkxpfg9fp6ss4gs1g5pappgns6183q3i6j02hd";
sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50";
};
buildInputs = [ libuuid ];

5
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, gts
, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext
}:
stdenv.mkDerivation rec {
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
buildInputs =
[ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig
pango gd gts
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
patches = [ ./fix-broken-memcp-signature.patch ];

6
pkgs/tools/graphics/mscgen/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
name = "mscgen-${version}";
src = fetchurl {
url = "www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
url = "http://www.mcternan.me.uk/mscgen/software/mscgen-src-${version}.tar.gz";
sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
};
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
'';
meta = {
homepage = "http://www.mcternan.me.uk/mscgen/";
description = "convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
homepage = http://www.mcternan.me.uk/mscgen/;
description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
license = "GPLv2";
longDescription = ''

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

@@ -12,7 +12,7 @@ let
baseName="ised";
version="2.2.2";
name="${baseName}-${version}";
url="mirror://sf/project/ised/${name}.tar.bz2";
url="mirror://sourceforge/project/ised/${name}.tar.bz2";
hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn";
};
in

36
pkgs/tools/networking/dd-agent/default.nix Normal file
View File

@@ -0,0 +1,36 @@
{ stdenv, fetchgit, python, sysstat }:
stdenv.mkDerivation rec {
name = "dd-agent-ab14fde6f9";
src = fetchgit {
url = git://github.com/DataDog/dd-agent.git;
rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770";
sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5";
};
buildInputs = [ python ];
postUnpack = "export sourceRoot=$sourceRoot/packaging";
makeFlags = [ "BUILD=$(out)" ];
installTargets = [ "install_base" "install_full" ];
postInstall = ''
mv $out/usr/* $out
rmdir $out/usr
'';
meta = {
description = "Event collector for the DataDog analysis service";
homepage = http://www.datadoghq.com;
maintainers = [ stdenv.lib.maintainers.shlevy ];
license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/tools/security/tor/torsocks.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "torsocks";
name = "${pname}-${version}";
version = "1.0-epsilon";
version = "1.2";
src = fetchurl {
url = "http://${pname}.googlecode.com/files/${name}.tar.gz";
sha256 = "0508i4q9gm0rrav018z1jn4as5if3qrfdng6dmmzgs324hvdgap5";
sha256 = "1m0is5q24sf7jjlkl0icfkdc0m53nbkg0q72s57p48yp4hv7v9dy";
};
preConfigure = ''

6
pkgs/tools/security/vidalia/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "vidalia-${version}";
version = "0.2.17";
version = "0.2.21";
src = fetchurl {
url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r";
sha256 = "1rqvvhdqgk6jqrd15invvc4r7p4nckd3b93hhr5dzpc1fxz8w064";
};
buildInputs = [ cmake qt4 ];
@@ -18,4 +18,4 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ];
platforms = platforms.all;
};
}
}

2
pkgs/tools/system/hardlink/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation {
name = "hardlink-2012.9.${rev}";
src = fetchurl {
url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
url = "http://pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647";
name = "hardlink-${rev}.zip";
};

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

@@ -2,8 +2,8 @@
let
driverdb = fetchurl {
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3685";
sha256 = "11zczy03asfpj4wwip5bf3fpingdc7biz1cs3cykg4vnlxiwjxkx";
url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3742";
sha256 = "04xsgxzc1mqn9szazyr6v3xcpw0pszi8vz7xcsb661rww5482rw0";
name = "smartmontools-drivedb.h";
};
in