diff options
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/compression/xdelta/default.nix | 24 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/encfs/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/misc/tmux/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/tools/networking/flvstreamer/default.nix | 39 | ||||
| -rw-r--r-- | pkgs/tools/networking/tcpdump/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nix/sqlite.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/system/dd_rescue/default.nix | 63 |
8 files changed, 202 insertions, 8 deletions
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix new file mode 100644 index 0000000000000..c85c7366cda84 --- /dev/null +++ b/pkgs/tools/compression/xdelta/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "xdelta-3.0z"; + + src = fetchurl { + url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz; + sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m"; + }; + + installPhase = + '' + mkdir -p $out/bin + cp xdelta3 $out/bin/ + + mkdir -p $out/share/man/man1 + cp xdelta3.1 $out/share/man/man1/ + ''; + + meta = { + homepage = http://xdelta.org/; + description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression"; + }; +} diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix new file mode 100644 index 0000000000000..c950810026a81 --- /dev/null +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, openssl, fuse, boost, rlog }: + +stdenv.mkDerivation { + name = "encfs-1.6.1"; + + src = fetchurl { + url = "http://encfs.googlecode.com/files/encfs-1.6-1.tgz"; + sha256 = "0k50ic5nyibb9giif9dqm6sj20q0yzri3drg78m788z17xp060mw"; + }; + + buildInputs = [ boost fuse openssl rlog ]; + + configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem"; + + meta = { + homepage = http://www.arg0.net/encfs; + description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + }; +} diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 4191ffd6f800c..998737660242f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto, - docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}: + makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl, + pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups, + notify }: stdenv.mkDerivation rec { name = "${meta.name}-${meta.version}"; @@ -9,10 +11,15 @@ stdenv.mkDerivation rec { sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww"; }; buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412 - libxml2 docbook_xsl desktop_file_utils libusb cups]; + libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject + pygtk pythonDBus pycups notify ]; configureFlags = "--with-udev-rules"; + postInstall = '' + wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0" + ''; + meta = { name = "system-config-printer"; version = "1.2.4"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix new file mode 100644 index 0000000000000..10793753ab59a --- /dev/null +++ b/pkgs/tools/misc/tmux/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, ncurses, libevent}: + +stdenv.mkDerivation rec { + pname = "tmux"; + version = "1.3"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.gz"; + sha256 = "72c2d6f1c30fb4ccbd29b530a7d8a08e67c9c2d87ac8d67e3806561670fc0362"; + }; + + makeFlags = "PREFIX=\${out}"; + + buildInputs = [ ncurses libevent ]; + + meta = { + homepage = http://tmux.sourceforge.net/; + description = "tmux is a terminal multiplexer"; + + longDescription = + '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: + + * A powerful, consistent, well-documented and easily scriptable command interface. + * A window may be split horizontally and vertically into panes. + * Panes can be freely moved and resized, or arranged into preset layouts. + * Support for UTF-8 and 256-colour terminals. + * Copy and paste with multiple buffers. + * Interactive menus to select windows, sessions or clients. + * Change the current window by searching for text in the target. + * Terminal locking, manually or after a timeout. + * A clean, easily extended, BSD-licensed codebase, under active development. + ''; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thammers ]; + }; +} diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix new file mode 100644 index 0000000000000..c3ac4e205ae22 --- /dev/null +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "flvstreamer-2.1c1"; + + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/flvstreamer/source/${name}.tar.gz"; + sha256 = "e90e24e13a48c57b1be01e41c9a7ec41f59953cdb862b50cf3e667429394d1ee"; + }; + + buildPhase = '' + make posix + ''; + + installPhase = '' + ensureDir $out/bin + cp flvstreamer $out/bin + cp streams $out/bin + cp rtmpsrv $out/bin + cp rtmpsuck $out/bin + ''; + + meta = { + description = "flvstreamer is an command-line RTMP client"; + + longDescription = + '' flvstreamer is an open source command-line RTMP client intended to + stream audio or video content from all types of flash or rtmp servers. + ''; + + license = "GPLv2+"; + + homepage = http://savannah.nongnu.org/projects/flvstreamer; + + maintainers = [ stdenv.lib.maintainers.thammers ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 640b305591e27..e9e55f48beec1 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, enableStatic ? false }: stdenv.mkDerivation rec { - name = "tcpdump-4.1.0"; + name = "tcpdump-4.1.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${name}.tar.gz"; - sha256 = "1yhmz23cb0qx16nwnmyk2v7nnqai20lzcc4lx34v728qdpkmc1in"; + sha256 = "02kz3sghpg16p26dhid8ma67pxil8x5jqdd83fvdnypcc6ylpkg6"; }; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix index be9dfeec6c4f2..793fc57350a3a 100644 --- a/pkgs/tools/package-management/nix/sqlite.nix +++ b/pkgs/tools/package-management/nix/sqlite.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null +, pkgconfig, boehmgc , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation rec { - name = "nix-1.0pre23559"; + name = "nix-1.0pre24749"; src = fetchurl { - url = "http://hydra.nixos.org/build/614186/download/4/${name}.tar.bz2"; - sha256 = "5c7fd783effc9c570f6feb5631f94e369a37de6b4fb2f51459964e48c465dcfa"; + url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2"; + sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970"; }; - buildInputs = [ perl curl openssl ]; + buildInputs = [ perl curl openssl pkgconfig boehmgc ]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} --with-bzip2=${bzip2} --with-sqlite=${sqlite} --disable-init-state + --enable-gc CFLAGS=-O3 CXXFLAGS=-O3 ''; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix new file mode 100644 index 0000000000000..b018de88f4647 --- /dev/null +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -0,0 +1,63 @@ +x@{builderDefsPackage + , ...}: +builderDefsPackage +(a : +let + helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ + []; + + buildInputs = map (n: builtins.getAttr n x) + (builtins.attrNames (builtins.removeAttrs x helperArgNames)); + sourceInfo = rec { + baseName="dd_rescue"; + version="1.22"; + name="${baseName}-${version}"; + url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; + hash="0n0vs4cn5csdcsmlndg3z36ws68zlckj17zrbm6wynrbs8iirclp"; + }; +in +rec { + src = a.fetchurl { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + }; + dd_rhelp_src = a.fetchurl { + url = "http://www.kalysto.org/pkg/dd_rhelp-0.1.2.tar.gz"; + sha256 = "0fhzkflg1ygiaj5ha0bf594d76vlgjsfwlpcmwrbady9frxvlkvv"; + }; + + inherit (sourceInfo) name version; + inherit buildInputs; + + /* doConfigure should be removed if not needed */ + phaseNames = ["doMakeInstall" "install_dd_rhelp" "fixPaths"]; + makeFlags=[ + ''prefix="$out"'' + ''DESTDIR="$out"'' + ''INSTASROOT='' + ]; + + fixPaths = a.doPatchShebangs ''$out/bin''; + + install_dd_rhelp = a.fullDepEntry ('' + ensureDir "$out/share/dd_rescue" "$out/bin" + tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" + cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" + '') ["minInit" "defEnsureDir"]; + + meta = { + description = "A tool to copy data from a damaged block device"; + maintainers = with a.lib.maintainers; + [ + raskin + ]; + platforms = with a.lib.platforms; + linux; + }; + passthru = { + updateInfo = { + downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; + }; + }; +}) x + |