diff options
Diffstat (limited to 'pkgs/tools')
21 files changed, 154 insertions, 36 deletions
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index d7d1533b3be..35370ae2128 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -5,6 +5,7 @@ buildPythonPackage rec { name = "xpra-0.9.5"; + namePrefix = ""; src = fetchurl { url = "http://xpra.org/src/${name}.tar.bz2"; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index f6a51eb3193..854801a3edd 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonPackage rec { name = "obnam-${version}"; - version = "1.6"; + version = "1.6.1"; namePrefix = ""; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz"; - sha256 = "1vg0kppbyngvm7wi2pbg3himixy9v3h8z66lcps6pclw43s1kgpm"; + sha256 = "0415njniqpy3xhvibpm82i9alrp2fw3lsnm15h7vqkkvgp8s5g39"; }; buildInputs = [ pythonPackages.sphinx attr ]; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix new file mode 100644 index 00000000000..183b889da9b --- /dev/null +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, pkgconfig, utillinux, kmod }: + +stdenv.mkDerivation rec { + name = "bcache-tools-${version}"; + version = "1.0.5"; + + src = fetchurl { + url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz"; + sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l"; + }; + + buildInputs = [ pkgconfig utillinux ]; + + # * Remove broken install rules (they ignore $PREFIX) for stuff we don't need + # anyway (it's distro specific stuff). + # * Fixup absolute path to modprobe. + prePatch = '' + sed -e "/INSTALL.*initramfs\/hook/d" \ + -e "/INSTALL.*initcpio\/install/d" \ + -e "/INSTALL.*dracut\/module-setup.sh/d" \ + -i Makefile + + sed -e "s|/sbin/modprobe|${kmod}/sbin/modprobe|" -i bcache-register + ''; + + preBuild = '' + export makeFlags="$makeFlags PREFIX=\"$out\" UDEVLIBDIR=\"$out/lib/udev/\""; + ''; + + preInstall = '' + mkdir -p "$out/sbin" "$out/lib/udev/rules.d" "$out/share/man/man8" + ''; + + meta = with stdenv.lib; { + description = "User-space tools required for bcache (Linux block layer cache)"; + longDescription = '' + Bcache is a Linux kernel block layer cache. It allows one or more fast + disk drives such as flash-based solid state drives (SSDs) to act as a + cache for one or more slower hard disk drives. + + This package contains the required user-space tools. + + User documentation is in Documentation/bcache.txt in the Linux kernel + tree. + ''; + homepage = http://bcache.evilpiepirate.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 40a2f7f481d..cca459c1a29 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.01.23.4"; + version = "2014.01.30.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0wnw11s3k191wqf3h13ibdbkgdyabv3gigsjk5xq3sqswlmmcvd9"; + sha256 = "1bx4ip1d4gp057nha4ylj2baksxg8kkxgvsdcx6bj36wbb0f8fl9"; }; buildInputs = [ python ]; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix new file mode 100644 index 00000000000..f667d772ac4 --- /dev/null +++ b/pkgs/tools/networking/bully/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, openssl, libpcap}: + +stdenv.mkDerivation rec { + name = "bully-${version}"; + version = "1.0-22"; + src = fetchurl { + url = "https://github.com/bdpurcell/bully/archive/v${version}.tar.gz"; + sha256 = "72f568f659fdcf70455a17f91f25dde65a53431c67c796517d3d3c4a4703ab68"; + }; + buildInputs = [ openssl libpcap ]; + + buildPhase = '' + cd src + make + ''; + + installPhase = '' + mkdir -p $out/bin + mv bully $out/bin + ''; + + meta = { + description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point."; + homepage = "https://github.com/bdpurcell/bully"; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + license = stdenv.lib.licenses.gpl3; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 8346be2ceb5..54f3e860e0c 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,11 +1,18 @@ -{fetchurl, stdenv, gupnp, gssdp, pkgconfig, glib, libxml2, libsoup, gtk, libglade, gnomeicontheme, e2fsprogs}: +{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}: stdenv.mkDerivation rec { - name = "gupnp-tools-0.6"; + name = "gupnp-tools-${version}"; + majorVersion = "0.8"; + version = "${majorVersion}.8"; src = fetchurl { - url = "http://www.gupnp.org/sources/gupnp-tools/gupnp-tools-0.6.tar.gz"; - sha256 = "08fnggk85zqdcvm4np53yxw15b3ck25c2rmyfrh04g8j25qf50dj"; + url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; + sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; }; - buildInputs = [gupnp gssdp pkgconfig glib libxml2 libsoup gtk libglade gnomeicontheme e2fsprogs]; + buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av gnome3.gnome_icon_theme gnome3.gnome_themes_standard makeWrapper]; + + postInstall = '' + wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" + wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gnome_icon_theme}/share:$out/share" + ''; } diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index a1f5026fb28..c40764866eb 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; platforms = platforms.linux; + maintainers = maintainers.mornfall; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 99793c139cb..54f6689582d 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchurl, pkgconfig, glib }: let - name = "nbd-3.5"; + name = "nbd-3.7"; in stdenv.mkDerivation { inherit name; src = fetchurl { - url = "mirror://sourceforge/nbd/${name}.tar.bz2"; - sha256 = "0frnbmdcm1b0nmmpvpwjb9h1yabdpwwd2l95056mhl2zaafh8gqx"; + url = "mirror://sourceforge/nbd/${name}.tar.xz"; + sha256 = "1k4bvg5rg4q6b58y4kd9qwj07sznsfbknlpc6y1bk6c48rgr3d0b"; }; buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders; postInstall = '' mkdir -p "$out/share/doc/${name}" - cp README "$out/share/doc/${name}/README" + cp README.md "$out/share/doc/${name}/" ''; # The test suite doesn't succeed in chroot builds. diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 1f785fdf730..0b68ec83b52 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -13,15 +13,16 @@ let url = mirror://sourceforge/hpnssh/openssh-6.3p1-hpnssh14v2.diff.gz; sha256 = "1jldqjwry9qpxxzb3mikfmmmv90mfb7xkmcfdbvwqac6nl3r7bi3"; }; + optionalString = stdenv.lib.optionalString; in stdenv.mkDerivation rec { - name = "openssh-6.4p1"; + name = "openssh-6.5p1"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1lkmi7v83qvpcc04qrrqk4k7mafnmwxkfk1ccsisw51va4bgcc2m"; + sha256 = "09wh7mi65aahyxd2xvq1makckhd5laid8c0pb8njaidrbpamw6d1"; }; prePatch = stdenv.lib.optionalString hpnSupport @@ -32,9 +33,8 @@ stdenv.mkDerivation rec { patches = [ ./locale_archive.patch ]; - buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ - (if withKerberos then [ kerberos ] else []) - ; + buildInputs = [ zlib openssl libedit pkgconfig pam ] + ++ stdenv.lib.optional withKerberos [ kerberos ]; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -44,8 +44,8 @@ stdenv.mkDerivation rec { --with-libedit=yes --disable-strip ${if pam != null then "--with-pam" else "--without-pam"} - ${if etcDir != null then "--sysconfdir=${etcDir}" else ""} - ${if withKerberos then "--with-kerberos5=${kerberos}" else ""} + ${optionalString (etcDir != null) "--sysconfdir=${etcDir}"} + ${optionalString withKerberos "--with-kerberos5=${kerberos}"} ''; preConfigure = @@ -67,11 +67,12 @@ stdenv.mkDerivation rec { installTargets = "install-nosysconf"; - meta = { - homepage = http://www.openssh.org/; + meta = with stdenv.lib; { + homepage = "http://www.openssh.org/"; description = "An implementation of the SSH protocol"; license = "bsd"; - platforms = stdenv.lib.platforms.unix; - maintainers = stdenv.lib.maintainers.eelco; + platforms = platforms.unix; + maintainers = with maintainers; [ eelco ]; + broken = hpnSupport; # cf. https://github.com/NixOS/nixpkgs/pull/1640 }; } diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index acea2d6da6a..2e27c2b2dc3 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { description = "tcpdump, a famous network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; + maintainers = stdenv.lib.maintainers.mornfall; }; } diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index e801bcfb2c2..01dea9c35e3 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -39,9 +39,10 @@ stdenv.mkDerivation { done # */ ''; - meta = { + meta = with stdenv.lib; { description = "The Debian package manager"; homepage = http://wiki.debian.org/Teams/Dpkg; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = maintainers.mornfall; }; } diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index b35d3b66ad8..73b0ca58828 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://www.rpm.org/; license = "GPLv2"; description = "The RPM Package Manager"; + maintainers = stdenv.lib.maintainers.mornfall; }; } diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index ad1cb6bec90..4be2393eed5 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - name = "ccid-1.4.13"; + version = "1.4.14"; + name = "ccid-${version}"; src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/pcsc-lite-ccid/ccid-1.4.13.tar.bz2/89c167a873df1f8bc0dc907ce209e5ff/ccid-1.4.13.tar.bz2"; - sha256 = "1w0mxb5qzps9x2fcggv958mwgwmvfxxj4nspxs67fa7qg7r6yxar"; + url = "http://ftp.de.debian.org/debian/pool/main/c/ccid/ccid_${version}.orig.tar.bz2"; + sha256 = "0inibkhzk4ghg85jkysscjrzshmxfdzz6b54dqj182l0isn082y5"; }; patchPhase = '' diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index b27707a0015..624fcdbe6c6 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mkpasswd-${version}"; - version = "5.0.26"; + version = "5.1.1"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/w/whois/whois_${version}.tar.xz"; - sha256 = "729625ef81425f4771e06492bb4f3e9f24bff75b8176044ce8d2f605f7ad6af5"; + sha256 = "0i06a9mb9qcq272782mg6dffv3k7bqkw4cdr31yrc0s6jqylryv9"; }; preConfigure = '' diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index 73b6f660bf9..1b2e940540d 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -20,4 +20,9 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap libX11 gtk pkgconfig openssl python pygtk makeWrapper pysqlite ]; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = maintainers.mornfall; + }; } diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index de0fef9b73f..18fa1045153 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }: stdenv.mkDerivation rec { - name = "pcsclite-1.8.8"; + version = "1.8.10"; + name = "pcsclite-${version}"; src = fetchurl { - url = "http://alioth.debian.org/frs/download.php/3862/${name}.tar.bz2"; - sha256 = "1rw5530vr2jf02ziyf32jbd98n5q8zjcfwp5nkw3x3bkgr53arpy"; + url = "http://ftp.de.debian.org/debian/pool/main/p/pcsc-lite/pcsc-lite_${version}.orig.tar.bz2"; + sha256 = "04i63zi9ayg38z3cahp6gf3rgx23w17bmcpdccm2hvaj63blnz30"; }; # The OS should care on preparing the drivers into this location diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index 4d216bee0b6..6ce09499780 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 doxygen ]; + patches = [ ./gcc-4.7.patch ]; + meta = with stdenv.lib; { homepage = https://www.torproject.org/projects/vidalia.html.en; description = "a cross-platform graphical controller for the Tor software, built using the Qt framework"; diff --git a/pkgs/tools/security/vidalia/gcc-4.7.patch b/pkgs/tools/security/vidalia/gcc-4.7.patch new file mode 100644 index 00000000000..4c163af760c --- /dev/null +++ b/pkgs/tools/security/vidalia/gcc-4.7.patch @@ -0,0 +1,12 @@ +diff -ru vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp +--- vidalia-0.3.1_orig/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:02:01.901732270 +0200 ++++ vidalia-0.3.1/src/vidalia/plugin/PluginEngine.cpp 2012-08-08 18:03:26.241677875 +0200 +@@ -20,6 +20,8 @@ + + #include "Vidalia.h" + ++#include <unistd.h> ++ + PluginEngine::PluginEngine(QObject *parent) + : QScriptEngine(parent) + { diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 83a89cfb602..adc8d9ec486 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchgit, autoreconfHook, pkgconfig, pcre, zlib, lzma}: -let release = "0.18.1"; in +let release = "0.19.1"; in stdenv.mkDerivation { name = "silver-searcher-${release}"; src = fetchgit { url = "https://github.com/ggreer/the_silver_searcher.git"; rev = "refs/tags/${release}"; - sha256 = "bf2c8f3c68895e0ee00d373c1d87201e806b413bb28373ee168e375f2a095ec5"; + sha256 = "1km3ap74mls7vkp6si4f302zb1ifmldipjyfw2z9akqpvr3n44p9"; }; buildInputs = [ autoreconfHook pkgconfig pcre zlib lzma ]; diff --git a/pkgs/tools/typesetting/pdfjam/default.nix b/pkgs/tools/typesetting/pdfjam/default.nix index e9b46eaa985..426cef3c85d 100644 --- a/pkgs/tools/typesetting/pdfjam/default.nix +++ b/pkgs/tools/typesetting/pdfjam/default.nix @@ -5,4 +5,8 @@ url = http://www.warwick.ac.uk/go/pdfjam/pdfjam_1.20.tgz; sha256 = "05g3mx7mb6h15ivbv0f53r369xphy8ad8a2xblpnk9mrnlrkaxy9"; }; + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = maintainers.mornfall; + }; } diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index 4cb03e7d2c5..8b06cbb5a2b 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -20,5 +20,6 @@ rec { meta = { description = "Extra components for TeXLive: beamer class"; + maintainers = stdenv.lib.maintainers.mornfall; }; } |