diff options
Diffstat (limited to 'pkgs/tools')
58 files changed, 402 insertions, 331 deletions
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 98808c7d399c..ce439d22c21c 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xnee/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix new file mode 100644 index 000000000000..5158963258c2 --- /dev/null +++ b/pkgs/tools/X11/xrestop/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, xlibs, pkgconfig, ncurses }: +stdenv.mkDerivation rec { + + name = "xrestop-${version}"; + version = "0.4"; + + src = fetchurl { + url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz; + sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; + }; + + buildInputs = [ pkgconfig xlibs.libX11 xlibs.libXres xlibs.libXext ncurses ]; +} diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index 51d5d35fe800..24249e383951 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 767e85d67733..ff51b28f34bb 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -8,11 +8,12 @@ stdenv.mkDerivation rec { sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9"; }; - preConfigure = - '' - makeFlagsArray=(DEST_HOME=$out) - buildFlags=all3 - ''; + preConfigure = '' + makeFlagsArray=(DEST_HOME=$out) + buildFlags=all3 + '' + stdenv.lib.optionalString stdenv.isDarwin '' + cp makefile.macosx_64bits makefile.machine + ''; enableParallelBuilding = true; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 7346b8e4e058..273b394881b6 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix new file mode 100644 index 000000000000..f5d4322ec932 --- /dev/null +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, pkgconfig, qt4, taglib, chromaprint, ffmpeg }: + +stdenv.mkDerivation rec { + name = "acoustid-fingerprinter-${version}"; + version = "0.6"; + + src = fetchurl { + url = "http://bitbucket.org/acoustid/acoustid-fingerprinter/downloads/" + + "${name}.tar.gz"; + sha256 = "0ckglwy95qgqvl2l6yd8ilwpd6qs7yzmj8g7lnxb50d12115s5n0"; + }; + + buildInputs = [ cmake pkgconfig qt4 taglib chromaprint ffmpeg ]; + + meta = { + homepage = "http://acoustid.org/fingerprinter"; + description = "Audio fingerprinting tool using chromaprint"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 0b0c1dbb9438..e10b44d63c82 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, python, librsync, gnupg, boto, makeWrapper }: +{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper }: stdenv.mkDerivation { - name = "duplicity-0.6.20"; + name = "duplicity-0.6.21"; src = fetchurl { - url = "http://code.launchpad.net/duplicity/0.6-series/0.6.20/+download/duplicity-0.6.20.tar.gz"; - sha256 = "0r0nf7arc3n5ipvvbh7h6ksqzbl236iv5pjpmd5s7lff3xswdl2i"; + url = "http://code.launchpad.net/duplicity/0.6-series/0.6.21/+download/duplicity-0.6.21.tar.gz"; + sha256 = "01ppxzghnig7al9cwi8ap95y0d3j5n0vf3ag06iw3ysiq6k8lqm3"; }; installPhase = '' python setup.py install --prefix=$out wrapProgram $out/bin/duplicity \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \ - --prefix PATH : "${gnupg}/bin" + --prefix PATH : "${gnupg}/bin:${ncftp}/bin" wrapProgram $out/bin/rdiffdir \ --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto})" \ ''; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix new file mode 100644 index 000000000000..affedcae73a0 --- /dev/null +++ b/pkgs/tools/backup/duply/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, coreutils, python, duplicity, gawk, gnupg1, bash +, gnugrep, txt2man, makeWrapper }: + +stdenv.mkDerivation { + name = "duply-1.5.11"; + + src = fetchurl { + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/1.5.x/duply_1.5.11.tgz"; + sha256 = "07z4wl75z227v8y9xwc2pfdp307a5jzx4sif598vprqync0g6mmk"; + }; + + buildInputs = [ txt2man makeWrapper ]; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + sed -i 's|/usr/bin/env bash|${bash}/bin/bash|' duply + mv duply "$out/bin" + wrapProgram "$out/bin/duply" --set PATH \ + "${coreutils}/bin:${python}/bin:${duplicity}/bin:${gawk}/bin:${gnupg1}/bin:${bash}/bin:${gnugrep}/bin:${txt2man}/bin" + "$out/bin/duply" txt2man | gzip -c > "$out/share/man/man1/duply.1.gz" + ''; + + meta = with stdenv.lib; { + description = "Shell front end for the duplicity backup tool"; + longDescription = '' + Duply is a shell front end for the duplicity backup tool + http://duplicity.nongnu.org/. It greatly simplifies it's usage by + implementing backup job profiles, batch commands and more. Who says + secure backups on non-trusted spaces are no child's play? + ''; + homepage = http://duply.net/; + license = licenses.gpl2; + maintainers = [ maintainers.bjornfor ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 2c2eb2f80d1f..514b69a19923 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xorriso/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index d15b26f48b65..0e6742253441 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 6b74ba41ecab..26c1597f2aa8 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; licenses = [ "GPLv2+" "LGPLv2.1+" ]; - maintainers = with stdenv.lib.maintainers; [ sander ludo ]; + maintainers = with stdenv.lib.maintainers; [ sander ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index a091142db249..9c8d18231f0f 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }: -let version = "0.20pre20130509"; in +let version = "0.20pre20130705"; in stdenv.mkDerivation { name = "btrfs-progs-${version}"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git"; - rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69"; - sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21"; + rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"; + sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2"; }; buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ]; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index 717b08acc5f9..bbb6d2efc7b2 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = "GPLv2+"; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index bf7b5f40801e..f5c07b031b80 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mtools/; description = "GNU mtools, utilities to access MS-DOS disks"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/coreutils/8.19.nix b/pkgs/tools/misc/coreutils/8.19.nix index f3bee5519600..23db167f3070 100644 --- a/pkgs/tools/misc/coreutils/8.19.nix +++ b/pkgs/tools/misc/coreutils/8.19.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index f55fbc31925a..da3e8d09a237 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -72,7 +72,7 @@ let license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix new file mode 100644 index 000000000000..ea54ab4a543d --- /dev/null +++ b/pkgs/tools/misc/grc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, python }: + +stdenv.mkDerivation rec { + version = "1.4"; + name = "grc_${version}"; + + src = fetchurl { + url = "http://korpus.juls.savba.sk/~garabik/software/grc/${name}.tar.gz"; + sha256 = "1l7lskxfjk32kkv4aaqw5qcxvh972nab3x2jzy67m1aa0zpcbzdv"; + }; + + installPhase = '' + sed -i s%/usr%% install.sh + sed -i "s% /usr/bin/python%${python}/bin/python%" grc + sed -i "s% /usr/bin/python%${python}/bin/python%" grc + ./install.sh "$out" + ''; + + meta = with stdenv.lib; { + description = "Yet another colouriser for beautifying your logfiles or output of commands."; + homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; + license = licenses.gpl2; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + Generic Colouriser is yet another colouriser (written in Python) for + beautifying your logfiles or output of commands. + ''; + }; +} + diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d824d76a8649..919332244670 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ ludo shlevy ]; + maintainers = with stdenv.lib.maintainers; [ shlevy ]; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index b76b9a187151..e01a28ab1850 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/idutils/; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index ead17461750c..d58b57196d21 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 04ff98b5e7bb..0eceea4a57e7 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk2 }: stdenv.mkDerivation rec { - name = "parcellite-1.1.4"; + name = "parcellite-1.1.6"; src = fetchurl { url = "mirror://sourceforge/parcellite/${name}.tar.gz"; - sha256 = "10lr2gx81i7nlxvafa9j9hnlj402k1szyi08xsl841hs1m9zdwan"; + sha256 = "0nz951ykj162mfbcn3w9zk525ww6qcqn5yqdx13nx70fnn6rappi"; }; buildInputs = [ pkgconfig intltool gtk2 ]; @@ -14,5 +14,7 @@ stdenv.mkDerivation rec { description = "Lightweight GTK+ clipboard manager"; homepage = "http://parcellite.sourceforge.net"; license = "GPLv3+"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ iyzsong ]; }; } diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix new file mode 100644 index 000000000000..17be93dda8f7 --- /dev/null +++ b/pkgs/tools/misc/ponysay/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, python3, texinfo, makeWrapper }: + +stdenv.mkDerivation rec { + name = "ponysay-3.0.1"; + + src = fetchurl { + url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz"; + sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee"; + }; + + buildInputs = [ python3 texinfo makeWrapper ]; + + inherit python3; + + phases = "unpackPhase installPhase fixupPhase"; + + installPhase = '' + find -type f -name "*.py" | xargs sed -i "s@/usr/bin/env python3@$python3/bin/python3@g" + substituteInPlace setup.py --replace \ + "fileout.write(('#!/usr/bin/env %s\n' % env).encode('utf-8'))" \ + "fileout.write(('#!%s/bin/%s\n' % (os.environ['python3'], env)).encode('utf-8'))" + python3 setup.py --prefix=$out --freedom=partial install \ + --with-shared-cache=$out/share/ponysay \ + --with-bash + ''; + + meta = { + description = "cowsay reimplemention for ponies."; + homepage = http://terse.tk/ponysay/; + license = "GPLv3"; + maintainers = with stdenv.lib.maintainers; [ bodil ]; + }; +} diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 739fe8b801c9..e798ee669e2f 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 2a3f53d67417..7363719b66d3 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 8cf31ff72085..b267074e77fa 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man ''; - meta = { + meta = with stdenv.lib; { description = "Hides mouse pointer while not in use."; longDescription = '' Unclutter hides your X mouse cursor when you do not need it, to prevent @@ -28,5 +28,7 @@ stdenv.mkDerivation { unclutter -idle 1 & ''; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 661f1ae46eb2..f8ad1fd4d15e 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { license = "GPLv2+"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix new file mode 100644 index 000000000000..88460d86730c --- /dev/null +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "bwm-ng-0.6"; + + src = fetchurl { + url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; + sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; + }; + + buildInputs = [ ncurses ]; + + meta = with stdenv.lib; { + description = "Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor."; + homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; + license = licenses.gpl2; + platforms = platforms.unix; + + longDescription = '' + Features + + supports /proc/net/dev, netstat, getifaddr, sysctl, kstat, /proc/diskstats /proc/partitions, IOKit, devstat and libstatgrab + unlimited number of interfaces/devices supported + interfaces/devices are added or removed dynamically from list + white-/blacklist of interfaces/devices + output of KB/s, Kb/s, packets, errors, average, max and total sum + output in curses, plain console, CSV or HTML + configfile + + Short list of changes since 0.5 (for full list read changelog): + + curses2 output, a nice bar chart + disk input for bsd/macosx/linux/solaris + win32 network bandwidth support + moved to autotools + alot fixes + + Info + This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. + + I actually dont know if netstat input is usefull at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. + + (from homepage) + ''; + }; +} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 73dcb44269c3..40e2d9706221 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -3,12 +3,14 @@ , sslSupport ? false, openssl ? null , scpSupport ? false, libssh2 ? null , gssSupport ? false, gss ? null +, c-aresSupport ? false, c-ares ? null , linkStatic ? false }: assert zlibSupport -> zlib != null; assert sslSupport -> openssl != null; assert scpSupport -> libssh2 != null; +assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { name = "curl-7.30.0"; @@ -24,6 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with stdenv.lib; optional zlibSupport zlib ++ optional gssSupport gss ++ + optional c-aresSupport c-ares ++ optional sslSupport openssl; preConfigure = '' @@ -33,6 +36,7 @@ stdenv.mkDerivation rec { ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ] + ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] ; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 33cc53d55110..f6be163bb839 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; - patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; + patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/bin/ifconfig,; s,/sbin/route,${nettools}/bin/route," src/tun.c''; installFlags = "prefix=\${out}"; diff --git a/pkgs/tools/networking/mpack/build-fix.patch b/pkgs/tools/networking/mpack/build-fix.patch new file mode 100644 index 000000000000..0329bedd07f3 --- /dev/null +++ b/pkgs/tools/networking/mpack/build-fix.patch @@ -0,0 +1,29 @@ +diff -ubr mpack-1.6-orig/unixos.c mpack-1.6/unixos.c +--- mpack-1.6-orig/unixos.c 2013-08-17 14:32:38.102772775 +0200 ++++ mpack-1.6/unixos.c 2013-08-17 14:32:43.180792505 +0200 +@@ -38,10 +38,6 @@ + #define MAXHOSTNAMELEN 64 + #endif + +-extern int errno; +-extern char *malloc(); +-extern char *getenv(); +- + int overwrite_files = 0; + int didchat; + +Only in mpack-1.6: unixos.o +Only in mpack-1.6: unixunpk.o +Only in mpack-1.6: uudecode.o +diff -ubr mpack-1.6-orig/xmalloc.c mpack-1.6/xmalloc.c +--- mpack-1.6-orig/xmalloc.c 2013-08-17 14:32:38.102772775 +0200 ++++ mpack-1.6/xmalloc.c 2013-08-17 14:33:08.900892319 +0200 +@@ -24,7 +24,6 @@ + */ + #include <stdio.h> + #include <string.h> +-extern char *malloc(), *realloc(); + + char *xmalloc (int size) + { +Only in mpack-1.6: xmalloc.o diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix new file mode 100644 index 000000000000..0d004a63920e --- /dev/null +++ b/pkgs/tools/networking/mpack/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +stdenv.mkDerivation rec { + name = "mpack-1.6"; + + src = fetchurl { + url = "http://ftp.andrew.cmu.edu/pub/mpack/${name}.tar.gz"; + sha256 = "0k590z96509k96zxmhv72gkwhrlf55jkmyqlzi72m61r7axhhh97"; + }; + + patches = [ ./build-fix.patch ]; + + preConfigure = "configureFlags=--mandir=$out/share/man"; + + meta = { + description = "utilities for encoding and decoding binary files in MIME"; + maintainers = [ stdenv.lib.maintainers.simons ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index 21bcb56bf0dc..515ea5edf88c 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -1,15 +1,16 @@ {stdenv, fetchurl, ncurses, coreutils}: -let version = "3.2.4"; in +let version = "3.2.5"; in stdenv.mkDerivation { name = "ncftp-${version}"; src = fetchurl { - # `ncftp.com' got stolen, apparently, so resort to Debian. - url = "mirror://debian/pool/main/n/ncftp/ncftp_${version}.orig.tar.gz"; - sha256 = "6f26e7891f3eab27eebd2bbbe2bc87d5ae872e610eaf0bc5652aec520adcf68a"; + url = "ftp://ftp.ncftp.com/ncftp/ncftp-${version}-src.tar.bz2"; + sha256 = "0hlx12i0lwi99qsrx7nccf4nvwjj2gych4yks5y179b1ax0y5sxl"; }; + buildInputs = [ ncurses ]; + preConfigure = '' find . -name "*.sh" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i find . -name "*.in" -type f | xargs sed 's@/bin/ls@${coreutils}/bin/ls@g' -i @@ -22,10 +23,10 @@ stdenv.mkDerivation { sed 's@/bin/rm@${coreutils}/bin/rm@g' -i configure ''; - meta = { - description = "NcFTP Client (also known as just NcFTP) is a set of FREE application programs implementing the File Transfer Protocol (FTP)."; - - # Homeless! - # homepage = http://www.ncftp.com/ncftp/; + meta = with stdenv.lib; { + description = "Command line FTP (File Transfer Protocol) client"; + homepage = http://www.ncftp.com/ncftp/; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index dfade6891249..7ef5eb17dc14 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { # Supports both the GNU and FreeBSD NSS. platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8542580e431b..6d3120e7b996 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,8 +1,12 @@ { stdenv, fetchurl, zlib, openssl, perl, libedit, pkgconfig, pam , etcDir ? null , hpnSupport ? false +, withKerberos ? false +, kerberos }: +assert withKerberos -> kerberos != null; + let hpnSrc = fetchurl { @@ -13,11 +17,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.2p1"; + name = "openssh-6.2p2"; src = fetchurl { url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha1 = "8824708c617cc781b2bb29fa20bd905fd3d2a43d"; + sha1 = "c2b4909eba6f5ec6f9f75866c202db47f3b501ba"; }; prePatch = stdenv.lib.optionalString hpnSupport @@ -26,13 +30,11 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = - [ ./locale_archive.patch - # Upstream fix for gratuitous "no such identity" warnings. - ./fix-identity-warnings.patch - ]; + patches = [ ./locale_archive.patch ]; - buildInputs = [ zlib openssl libedit pkgconfig pam ]; + buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ + (if withKerberos then [ kerberos ] else []) + ; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. @@ -43,6 +45,7 @@ stdenv.mkDerivation rec { --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 ""} ''; preConfigure = diff --git a/pkgs/tools/networking/openssh/fix-identity-warnings.patch b/pkgs/tools/networking/openssh/fix-identity-warnings.patch deleted file mode 100644 index c341889b3a47..000000000000 --- a/pkgs/tools/networking/openssh/fix-identity-warnings.patch +++ /dev/null @@ -1,251 +0,0 @@ -https://bugzilla.mindrot.org/show_bug.cgi?id=2084 - -@@ -, +, @@ - - dtucker@cvs.openbsd.org 2013/02/17 23:16:57 - [readconf.c ssh.c readconf.h sshconnect2.c] - Keep track of which IndentityFile options were manually supplied and which - were default options, and don't warn if the latter are missing. - ok markus@ - - dtucker@cvs.openbsd.org 2013/02/22 04:45:09 - [ssh.c readconf.c readconf.h] - Don't complain if IdentityFiles specified in system-wide configs are - missing. ok djm, deraadt. -Index: readconf.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/readconf.c,v ---- a/readconf.c 2 Oct 2011 07:59:03 -0000 1.174 -+++ b/readconf.c 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */ -+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */ - /* - * Author: Tatu Ylonen <ylo@cs.hut.fi> - * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland -@@ -326,6 +326,26 @@ clear_forwardings(Options *options) - options->tun_open = SSH_TUNMODE_NO; - } - -+void -+add_identity_file(Options *options, const char *dir, const char *filename, -+ int userprovided) -+{ -+ char *path; -+ -+ if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES) -+ fatal("Too many identity files specified (max %d)", -+ SSH_MAX_IDENTITY_FILES); -+ -+ if (dir == NULL) /* no dir, filename is absolute */ -+ path = xstrdup(filename); -+ else -+ (void)xasprintf(&path, "%.100s%.100s", dir, filename); -+ -+ options->identity_file_userprovided[options->num_identity_files] = -+ userprovided; -+ options->identity_files[options->num_identity_files++] = path; -+} -+ - /* - * Returns the number of the token pointed to by cp or oBadOption. - */ -@@ -353,7 +373,7 @@ parse_token(const char *cp, const char * - int - process_config_line(Options *options, const char *host, - char *line, const char *filename, int linenum, -- int *activep) -+ int *activep, int userconfig) - { - char *s, **charptr, *endofnumber, *keyword, *arg, *arg2; - char **cpptr, fwdarg[256]; -@@ -586,9 +606,7 @@ parse_yesnoask: - if (*intptr >= SSH_MAX_IDENTITY_FILES) - fatal("%.200s line %d: Too many identity files specified (max %d).", - filename, linenum, SSH_MAX_IDENTITY_FILES); -- charptr = &options->identity_files[*intptr]; -- *charptr = xstrdup(arg); -- *intptr = *intptr + 1; -+ add_identity_file(options, NULL, arg, userconfig); - } - break; - -@@ -1075,7 +1093,7 @@ parse_int: - - int - read_config_file(const char *filename, const char *host, Options *options, -- int checkperm) -+ int flags) - { - FILE *f; - char line[1024]; -@@ -1085,7 +1103,7 @@ read_config_file(const char *filename, c - if ((f = fopen(filename, "r")) == NULL) - return 0; - -- if (checkperm) { -+ if (flags & SSHCONF_CHECKPERM) { - struct stat sb; - - if (fstat(fileno(f), &sb) == -1) -@@ -1106,7 +1124,8 @@ read_config_file(const char *filename, c - while (fgets(line, sizeof(line), f)) { - /* Update line number counter. */ - linenum++; -- if (process_config_line(options, host, line, filename, linenum, &active) != 0) -+ if (process_config_line(options, host, line, filename, linenum, -+ &active, flags & SSHCONF_USERCONF) != 0) - bad_options++; - } - fclose(f); -@@ -1280,30 +1299,17 @@ fill_default_options(Options * options) - options->protocol = SSH_PROTO_2; - if (options->num_identity_files == 0) { - if (options->protocol & SSH_PROTO_1) { -- len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_IDENTITY, 0); - } - if (options->protocol & SSH_PROTO_2) { -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA); -- -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_RSA, 0); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_DSA, 0); - #ifdef OPENSSL_HAS_ECC -- len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1; -- options->identity_files[options->num_identity_files] = -- xmalloc(len); -- snprintf(options->identity_files[options->num_identity_files++], -- len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA); -+ add_identity_file(options, "~/", -+ _PATH_SSH_CLIENT_ID_ECDSA, 0); - #endif - } - } -Index: readconf.h -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/readconf.h,v ---- a/readconf.h 2 Oct 2011 07:59:03 -0000 1.83 -+++ b/readconf.h 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */ -+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */ - - /* - * Author: Tatu Ylonen <ylo@cs.hut.fi> -@@ -96,6 +96,7 @@ typedef struct { - - int num_identity_files; /* Number of files for RSA/DSA identities. */ - char *identity_files[SSH_MAX_IDENTITY_FILES]; -+ int identity_file_userprovided[SSH_MAX_IDENTITY_FILES]; - Key *identity_keys[SSH_MAX_IDENTITY_FILES]; - - /* Local TCP/IP forward requests. */ -@@ -148,15 +149,20 @@ typedef struct { - #define REQUEST_TTY_YES 2 - #define REQUEST_TTY_FORCE 3 - -+#define SSHCONF_CHECKPERM 1 /* check permissions on config file */ -+#define SSHCONF_USERCONF 2 /* user provided config file not system */ -+ - void initialize_options(Options *); - void fill_default_options(Options *); - int read_config_file(const char *, const char *, Options *, int); - int parse_forward(Forward *, const char *, int, int); - - int --process_config_line(Options *, const char *, char *, const char *, int, int *); -+process_config_line(Options *, const char *, char *, const char *, int, int *, -+ int); - - void add_local_forward(Options *, const Forward *); - void add_remote_forward(Options *, const Forward *); -+void add_identity_file(Options *, const char *, const char *, int); - - #endif /* READCONF_H */ -Index: ssh.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/ssh.c,v ---- a/ssh.c 6 Jul 2012 03:45:01 -0000 1.366 -+++ b/ssh.c 5 Apr 2013 02:36:11 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */ -+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */ - /* - * Author: Tatu Ylonen <ylo@cs.hut.fi> - * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland -@@ -405,12 +405,7 @@ main(int ac, char **av) - strerror(errno)); - break; - } -- if (options.num_identity_files >= -- SSH_MAX_IDENTITY_FILES) -- fatal("Too many identity files specified " -- "(max %d)", SSH_MAX_IDENTITY_FILES); -- options.identity_files[options.num_identity_files++] = -- xstrdup(optarg); -+ add_identity_file(&options, NULL, optarg, 1); - break; - case 'I': - #ifdef ENABLE_PKCS11 -@@ -584,7 +579,8 @@ main(int ac, char **av) - dummy = 1; - line = xstrdup(optarg); - if (process_config_line(&options, host ? host : "", -- line, "command-line", 0, &dummy) != 0) -+ line, "command-line", 0, &dummy, SSHCONF_USERCONF) -+ != 0) - exit(255); - xfree(line); - break; -@@ -678,14 +674,15 @@ main(int ac, char **av) - * file if the user specifies a config file on the command line. - */ - if (config != NULL) { -- if (!read_config_file(config, host, &options, 0)) -+ if (!read_config_file(config, host, &options, SSHCONF_USERCONF)) - fatal("Can't open user config file %.100s: " - "%.100s", config, strerror(errno)); - } else { - r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir, - _PATH_SSH_USER_CONFFILE); - if (r > 0 && (size_t)r < sizeof(buf)) -- (void)read_config_file(buf, host, &options, 1); -+ (void)read_config_file(buf, host, &options, -+ SSHCONF_CHECKPERM|SSHCONF_USERCONF); - - /* Read systemwide configuration file after user config. */ - (void)read_config_file(_PATH_HOST_CONFIG_FILE, host, -Index: sshconnect2.c -=================================================================== -RCS file: /home/dtucker/openssh/cvs/openssh/sshconnect2.c,v ---- a/sshconnect2.c 20 Mar 2013 01:55:15 -0000 1.184 -+++ b/sshconnect2.c 5 Apr 2013 02:36:07 -0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */ -+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */ - /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. - * Copyright (c) 2008 Damien Miller. All rights reserved. -@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt) - id = xcalloc(1, sizeof(*id)); - id->key = key; - id->filename = xstrdup(options.identity_files[i]); -- id->userprovided = 1; -+ id->userprovided = options.identity_file_userprovided[i]; - TAILQ_INSERT_TAIL(&files, id, next); - } - /* Prefer PKCS11 keys that are explicitly listed */ diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index eafa51fb4f25..43de92afe9aa 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -62,6 +62,6 @@ mkDerivation rec { license = "GPLv2+"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.phreedom ]; + maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 277e95eac96c..38adea8af8f9 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -90,7 +90,7 @@ buildPythonPackage { license = [ "GPLv2+" /* or */ "TGPPLv1+" ]; - maintainers = [ lib.maintainers.ludo lib.maintainers.simons ]; + maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 007efa42827a..bf0c2f80694c 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 3b6c28d2ac11..3e3b74dfe902 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/wget/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index bab89a1145eb..4d5eeca12c1f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.6pre3166_15e5ac8"; + name = "nix-1.6pre3187_3fb7ae0"; src = fetchurl { - url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz"; - sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558"; + url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz"; + sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 2cac2819c16d..baa8dd87ec1f 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.20"; + name = "gnupg-2.0.21"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "16mp0j5inrcqcb3fxbn0b3aamascy3n923wiy0y8marc0rzrp53f"; + sha256 = "1xgf1q1phdawk6y66haaqcvfnlsqk12jmjin1m2d5x6fqw18kpq0"; }; buildInputs @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { S/MIME. ''; - maintainers = with stdenv.lib.maintainers; [ ludo urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix new file mode 100644 index 000000000000..ba86b0b1d9ce --- /dev/null +++ b/pkgs/tools/security/pass/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, getopt }: + +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "password-store-${version}"; + + src = fetchurl { + url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; + sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1"; + }; + + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely."; + homepage = http://zx2c4.com/projects/password-store/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. + ''; + }; + + propagatedBuildInputs = [ getopt ]; + + installPhase = '' + # link zsh and fish completions + sed -ie '22s/^#//' Makefile + sed -ie '25s/^#//' Makefile + sed -i 's/find /find -L /' contrib/pass.zsh-completion + mkdir -p "$out/share/zsh/site-functions" + mkdir -p "$out/share/fish/completions" + + # use gnused + sed -i 's/sed -i ""/sed -i /' Makefile + + SYSCONFDIR="$out/etc" PREFIX="$out" make install + '' + stdenv.lib.optionalString stdenv.isDarwin '' + # use nix-supplied getopt + sed -ie '34c GETOPT="${getopt}/bin/getopt"' \ + "$out/lib/password-store.platform.sh" + ''; +} + diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 3ca410328152..e693143e4c41 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation { license = "GPLv2"; platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix new file mode 100644 index 000000000000..348d96b00247 --- /dev/null +++ b/pkgs/tools/security/torbutton/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit, zip }: +stdenv.mkDerivation rec { + + name = "torbutton-${version}.xpi"; + version = "1.6.1"; + + src = fetchgit { + url = https://git.torproject.org/torbutton.git; + rev = "refs/tags/${version}"; + sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv"; + }; + + buildInputs = [ zip ]; + + buildPhase = '' + mkdir pkg + ./makexpi.sh + ''; + + installPhase = "cat pkg/*.xpi > $out"; + + meta = with stdenv.lib; { + homepage = https://www.torproject.org/torbutton/; + description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content."; + license = licenses.mit; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index a2ea6176c746..1095d702d256 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/acct/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.allBut "i686-cygwin"; }; } diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix index 8fa40e5710f1..9afad675bb91 100644 --- a/pkgs/tools/system/ddrescue/default.nix +++ b/pkgs/tools/system/ddrescue/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 988989b82f75..111408d1339c 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 62afb2fe0785..82377aa92f55 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [ raskin ludo ]; + maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 98a737339d27..5a31d0096107 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index c8c336ad202c..e494eba13ce3 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 66fcb3d19290..d34ed00d436a 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = "GPLv3+"; platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index f971eb7b8665..ea06a6255508 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -36,6 +36,6 @@ let date = "2009-07-04"; in homepage = http://tidy.sourceforge.net/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 466a7e0c44b1..9f0194407750 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://namazu.org/; platforms = stdenv.lib.platforms.gnu; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 061f7651f9a6..ca3ec39da71f 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { description = "GNU Source-Highlight, source code renderer with syntax highlighting"; homepage = "http://www.gnu.org/software/src-highlite/"; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.all; longDescription = '' diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index b64d05e19e16..63de9c306939 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/wdiff/; description = "GNU wdiff, comparing files on a word by word basis"; license = "GPLv3+"; - maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 2b96ae526c40..ec1c9021522f 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -1,18 +1,18 @@ -{cabal, texLive, regexCompat}: +{ cabal, filepath, mtl, regexCompat, texLive }: cabal.mkDerivation (self: { pname = "lhs2tex"; version = "1.18.1"; - name = self.fname; sha256 = "0j4n7vkabsggn94gbwixy1vmckdck2nggdiqvk6n9nx164if5jnw"; - extraBuildInputs = [regexCompat texLive]; - + isLibrary = false; + isExecutable = true; + buildDepends = [ filepath mtl regexCompat ]; + extraLibraries = [ texLive ]; postInstall = '' mkdir -p "$out/share/doc/$name" cp doc/Guide2.pdf $out/share/doc/$name mkdir -p "$out/nix-support" ''; - meta = { homepage = "http://www.andres-loeh.de/lhs2tex/"; description = "Preprocessor for typesetting Haskell sources with LaTeX"; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 423772385958..c72192317b77 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = "GPLv2+"; homepage = https://fedorahosted.org/xmlto/; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index de2964a798f9..e4c8e99efdb6 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = "GPLv2+"; platforms = stdenv.lib.platforms.gnu; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ ]; }; } |