diff options
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/atool/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/backup/rdiff-backup/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/filesystems/dosfstools/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/filesystems/yandex-disk/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/misc/aescrypt/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/misc/youtube-dl/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/networking/dropbear/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/amule/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/libtorrent/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/rtorrent/default.nix | 24 | ||||
-rw-r--r-- | pkgs/tools/security/clamav/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/wgetpaste/default.nix | 4 |
12 files changed, 49 insertions, 40 deletions
diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index f041f2050ea..1db7a7a42eb 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/atool; description = "Archive command line helper"; - platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index d52cbdebb67..d58815f6d6d 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, python, librsync, gnused }: stdenv.mkDerivation { - name = "rdiff-backup-1.2.8"; + name = "rdiff-backup-1.3.3"; src = fetchurl { - url = mirror://savannah/rdiff-backup/rdiff-backup-1.2.8.tar.gz; - sha256 = "1nwmmh816f96h0ff1jxk95ad38ilbhbdl5dgibx1d4cl81dsi48d"; + url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz; + sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; phases = "unpackPhase installPhase"; @@ -15,11 +15,12 @@ stdenv.mkDerivation { "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; - buildInputs = [python librsync gnused ]; + buildInputs = [ python librsync gnused ]; meta = { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = "GPL-2"; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index a98def32835..b9f10105918 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "dosfstools-3.0.21"; + name = "dosfstools-3.0.24"; src = fetchurl { url = "http://daniel-baumann.ch/files/software/dosfstools/${name}.tar.xz"; - sha256 = "12c9ilcpknm7hg3czkc50azndd0yjdj4jjnvizhwqxy3g0gm2960"; + sha256 = "1hblhb98wm9gm60y32psdqm5jprs4a6dqzrapzgb6bw7r3kvf88y"; }; makeFlags = "PREFIX=$(out)"; meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; + repositories.git = git://daniel-baumann.ch/git/software/dosfstools.git; homepage = http://www.daniel-baumann.ch/software/dosfstools/; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 31b1471fb7f..24dbae08fab 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cp -r -t $out/share usr/share/* cp -r -t $out/etc etc/* - sed -i 's@have@${which}/bin/which >/dev/null 2>&1@' \ + sed -i 's@have@${which}/bin/which >/dev/null 2>\&1@' \ $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ @@ -49,6 +49,15 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [smironov]; platforms = ["i686-linux" "x86_64-linux"]; license = stdenv.lib.licenses.unfree; + longDescription = '' + Yandex.Disk console client for Linux lets you manage files on Disk without + using a window interface or programs that support WebDAV. The advantages + of the console client compared to a WebDAV connection: + * low system resource requirements; + * faster file reading and writing speeds; + * faster syncing with Disk's server; + * no need to be constantly connected to work with files. + ''; }; } diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index bec0840490d..f39e466c78f 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libiconvOrEmpty }: - + stdenv.mkDerivation rec { version = "3.0.9"; name = "aescrypt-${version}"; - + src = fetchurl { url = "http://www.aescrypt.com/download/v3/linux/${name}.tgz"; sha256 = "3f3590f9b7e50039611ba9c0cf1cae1b188a44bd39cfc41553db7ec5709c0882"; @@ -18,17 +18,17 @@ stdenv.mkDerivation rec { cp aescrypt $out/bin cp aescrypt_keygen $out/bin ''; - + buildInputs = [ libiconvOrEmpty ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; - + meta = with stdenv.lib; { - description = "A file encryption util that uses the industry standard Advanced Encryption Standard (AES) to easily and securely encrypt files"; + description = "encrypt files with Advanced Encryption Standard (AES)"; homepage = http://www.aescrypt.com/; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; + hydraPlatforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 86ef7617808..77d7efdb5f6 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 = "2013.10.23.2"; + version = "2013.12.08.1"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "d3f4c9e0da165395856e690314caa5eef4382bd994dd46f041a520bf9747c35d"; + sha256 = "0sqdc0fbk6xlfd5d2iy4r9kr5inl0122zzri08zndpl4cbzawhaq"; }; buildInputs = [ python ]; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://rg3.github.com/youtube-dl/"; + repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 933267eff23..00e747da7c7 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.60"; + name = "dropbear-2013.62"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1fw1hrcavfqjmsn34dhkrzh8w06yfqvfss2rkvvnxnad7d2m432c"; + sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6"; }; dontDisableStatic = enableStatic; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c92fcecc9fc..ac848b5d72e 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -1,7 +1,7 @@ { monolithic ? true # build monolithic amule , daemon ? false # build amule daemon , httpServer ? false # build web interface for the daemon -, client ? false # build amule remote gui +, client ? false # build amule remote gui , fetchurl, stdenv, zlib, wxGTK, perl, cryptopp, libupnp, gettext, libpng ? null , pkgconfig, makeWrapper }: @@ -10,7 +10,7 @@ with stdenv; let # Enable/Disable Feature edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag; -in +in mkDerivation rec { name = "aMule-2.3.1"; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index fb0a889d3ee..ea376fd2a7b 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, openssl, libsigcxx }: let - version = "0.13.2"; + version = "0.13.3"; in stdenv.mkDerivation { name = "libtorrent-${version}"; src = fetchurl { url = "http://libtorrent.rakshasa.no/downloads/libtorrent-${version}.tar.gz"; - sha256 = "ed2f2dea16c29cac63fa2724f6658786d955f975861fa6811bcf1597ff8a5e4f"; + sha256 = "0xsnyd1hnfvfq67y5s0ddhj2lhxmfms4djblaa0d1y5phdkpsc9l"; }; buildInputs = [ pkgconfig openssl libsigcxx ]; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index b503c1d9152..78eaf81e819 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl -, zlib, openssl }: +, zlib, openssl +}: -let - version = "0.9.2"; -in -stdenv.mkDerivation { - name = "rtorrent-${version}"; +stdenv.mkDerivation rec { + name = "rtorrent-0.9.3"; src = fetchurl { - url = "http://libtorrent.rakshasa.no/downloads/rtorrent-${version}.tar.gz"; - sha256 = "5c8f8c780bee376afce3c1cde2f5ecb928f40bac23b2b8171deed5cf3c888c3d"; + url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz"; + sha256 = "043krhsiawigf8yjd5qfkdn5iqrssph1705dsx5fgbxipr0wm4wy"; }; buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; - postInstall = '' - mkdir -p $out/share/man/man1 $out/share/rtorrent - mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc - ''; + # postInstall = '' + # mkdir -p $out/share/man/man1 $out/share/rtorrent + # mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 + # mv doc/rtorrent.rc $out/share/rtorrent/rtorrent.rc + # ''; meta = { homepage = "http://libtorrent.rakshasa.no/"; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 858320004b8..8315078c80f 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconv }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.97.8"; + version = "0.98"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "04pwm8a84silnvgimn2wi2wgwdzwpskybx72mp10ni1dd7yvswnq"; + sha256 = "1dmkaa6sqynv4v74s9izq7m7kk8d78rvwyd123q4gva6gx9m0d0i"; }; buildInputs = [ zlib bzip2 libiconv ]; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index a47eb2ddf9f..7635e042499 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, wget, bash, coreutils}: stdenv.mkDerivation rec { - version = "2.20"; + version = "2.23"; name = "wgetpaste-${version}"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "7a53836d02e07cefc3c2978bb129a037fa1e1222ba0e275c4e818230a6d6fb9e"; + sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n"; }; # currently zsh-autocompletion support is not installed |