diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-17 14:19:14 +0100 |
commit | 5bb548d2e4c866ce55efdd2e1cee5e9e72863156 (patch) | |
tree | 9276447eeac077bcea3e6013ebb37f7bba642be8 /pkgs/tools | |
parent | b4dd943f1635a7e8d2e440b703fa01c6c2126164 (diff) | |
parent | 3544f3223166583f1e5459822250f1821b258c1e (diff) | |
download | nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.gz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.bz2 nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.lz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.xz nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.tar.zst nixlib-5bb548d2e4c866ce55efdd2e1cee5e9e72863156.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/jfsutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/filesystems/reiserfsprogs/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/cuneiform/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/graphics/cuneiform/default.upstream | 8 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/graphics/jbig2enc/default.nix | 19 | ||||
-rw-r--r-- | pkgs/tools/graphics/mscgen/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/ised/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/security/tor/torsocks.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/vidalia/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/system/hardlink/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/system/logrotate/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/system/smartmontools/default.nix | 4 |
13 files changed, 55 insertions, 27 deletions
diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 79a9fad0e79b..dc07734b9603 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -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 ]; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 2283a0c17460..2c14bc624ae3 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "reiserfsprogs-3.6.21"; src = fetchurl { - url = "mirror://kernel/linux/utils/fs/reiserfs/${name}.tar.bz2"; + url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2"; sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam"; }; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 13f7d4b7f6fc..3c75af4bcf38 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -2,15 +2,15 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "1.0" a; + version = "1.1.0"; buildInputs = with a; [ cmake imagemagick patchelf ]; in rec { src = fetchurl { - url = "http://launchpad.net/cuneiform-linux/${version}/${version}/+download/cuneiform-linux-${version}.0.tar.bz2"; - sha256 = "bfa7acc6aade966ab62bc0f19e0ac1a843b659a70202229570c087ca8b15f39e"; + url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2"; + sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp"; }; inherit buildInputs; diff --git a/pkgs/tools/graphics/cuneiform/default.upstream b/pkgs/tools/graphics/cuneiform/default.upstream new file mode 100644 index 000000000000..4fb85a2a1e89 --- /dev/null +++ b/pkgs/tools/graphics/cuneiform/default.upstream @@ -0,0 +1,8 @@ +url https://launchpad.net/cuneiform-linux/+download + +do_overwrite () { + ensure_hash + set_var_value version "$CURRENT_VERSION" + set_var_value sha256 "$CURRENT_HASH" + set_var_value ' url' "$CURRENT_URL" +} diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index db4d766b7605..96ae324b01f0 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -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 ]; diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix new file mode 100644 index 000000000000..60704d6300c3 --- /dev/null +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchurl, leptonica, zlib, libwebp, giflib, libjpeg, libpng, libtiff }: stdenv.mkDerivation { + name = "jbig2enc-0.28"; + + src = fetchurl { + url = http://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; + }; + + propagatedBuildInputs = [ leptonica zlib libwebp giflib libjpeg libpng libtiff ]; + + # This is necessary, because the resulting library has + # /tmp/nix-build-jbig2enc/src/.libs before /nix/store/jbig2enc/lib + # in its rpath, which means that patchelf --shrink-rpath removes + # the /nix/store one. By cleaning up before fixup, we ensure that + # the /tmp/nix-build-jbig2enc/src/.libs directory is gone. + preFixup = '' + make clean + ''; +} diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 63e6afaa8039..ed69327b752a 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -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 = '' diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index f5f9112639c5..0a04886f64c6 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -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 diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 83cfee07e66e..ac60ccb16a1f 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -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 = '' diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 243604c2c79e..6f34d61908e1 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -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; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 192f7d871a1f..982aac3c9900 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -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"; }; diff --git a/pkgs/tools/system/logrotate/default.nix b/pkgs/tools/system/logrotate/default.nix index a9994f14b57a..784c8e75e768 100644 --- a/pkgs/tools/system/logrotate/default.nix +++ b/pkgs/tools/system/logrotate/default.nix @@ -1,11 +1,11 @@ -{stdenv, fetchurl, gzip, popt}: +{ stdenv, fetchurl, gzip, popt }: stdenv.mkDerivation rec { - name = "logrotate-3.7.8"; + name = "logrotate-3.8.3"; src = fetchurl { - url = https://fedorahosted.org/releases/l/o/logrotate/logrotate-3.7.8.tar.gz; - sha256 = "1p9nqmznqvzn03saw3jxa8xwsdqym8jr778rwig8kk786343vai1"; + url = "https://fedorahosted.org/releases/l/o/logrotate/${name}.tar.gz"; + sha256 = "0xqrz8xzs2c1vx8l5h9lp2ciwwifj7y52xsppb1vrvbi254vyxh7"; }; # Logrotate wants to access the 'mail' program; to be done. @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ popt ]; meta = { - homepage = "https://fedorahosted.org/releases/l/o/logrotate/"; + homepage = https://fedorahosted.org/releases/l/o/logrotate/; description = "Rotates and compresses system logs"; license = "GPLv2+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers.viric ]; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 89f8d3f5e77f..7a37e1200b48 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -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 |