David Thompson <dthomps...@worcester.edu> writes: > Please break this into 2 commits, one for each new package.
rTorrent and its libTorrent kind of belong together, though I guess they're strictly speaking separate packages... >> + (home-page "http://nmap.org/") > > Should be "http://libtorrent.rakshasa.no/" Whoops, too much copy & paste. :-) (I'm working on an nmap recipe too.) Here's the new patches. By the way the first does not strictly need the "#:use-module (gnu packages check)" since cppunit is commented out for now, but I left it there; is that OK?
>From 608d40907185b70bb4256ee48afecc3cc93e771b Mon Sep 17 00:00:00 2001 From: Taylan Ulrich B <taylanbayi...@gmail.com> Date: Sat, 22 Nov 2014 15:49:07 +0100 Subject: [PATCH 1/2] gnu: Add libTorrent. * gnu/packages/bittorrent.scm (libtorrent): New variable. --- gnu/packages/bittorrent.scm | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 8b43886..022eb4e 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -30,7 +30,8 @@ #:use-module ((gnu packages compression) #:select (zlib)) #:use-module (gnu packages glib) - #:use-module (gnu packages gtk)) + #:use-module (gnu packages gtk) + #:use-module (gnu packages check)) (define-public transmission (package @@ -88,3 +89,34 @@ DHT, µTP, PEX and Magnet Links.") ;; ;; A few files files carry an MIT/X11 license header. (license l:gpl3+))) + +(define-public libtorrent + (package + (name "libtorrent") + (version "0.13.4") + (source (origin + (method url-fetch) + (uri (string-append + "http://libtorrent.rakshasa.no/downloads/libtorrent-" + version ".tar.gz")) + (sha256 + (base32 + "0ma910br5vxrfpm4f4w4942lpmhwvqjnnf9h8vpf52fw35qhjkkh")))) + (build-system gnu-build-system) + (inputs `(("openssl" ,openssl) + ("zlib" ,zlib))) + (native-inputs `(("pkg-config" ,pkg-config) + ;; Add this when you enable tests: + ;; ("cppunit" ,cppunit) + )) + (arguments + ;; FIXME: enable tests on the next release: + ;; https://github.com/rakshasa/libtorrent/issues/59 + `(#:tests? #f)) + (synopsis "BitTorrent library of rtorrent") + (description + "LibTorrent is a BitTorrent library used by and developed in parallel +with the BitTorrent client rtorrent. It is written in C++ with emphasis on +speed and efficiency.") + (home-page "http://libtorrent.rakshasa.no/") + (license l:gpl2))) -- 2.1.2
>From b589329e9876d371a76d03223041c1bf79829444 Mon Sep 17 00:00:00 2001 From: Taylan Ulrich B <taylanbayi...@gmail.com> Date: Sat, 22 Nov 2014 15:57:26 +0100 Subject: [PATCH 2/2] gnu: Add rTorrent. * gnu/packages/bittorrent.scm (rtorrent): New variable. --- gnu/packages/bittorrent.scm | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 022eb4e..eb5362d 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -31,7 +31,11 @@ #:select (zlib)) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) - #:use-module (gnu packages check)) + #:use-module (gnu packages check) + #:use-module (gnu packages ncurses) + #:use-module (gnu packages curl) + #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages gnupg)) (define-public transmission (package @@ -120,3 +124,33 @@ with the BitTorrent client rtorrent. It is written in C++ with emphasis on speed and efficiency.") (home-page "http://libtorrent.rakshasa.no/") (license l:gpl2))) + +(define-public rtorrent + (package + (name "rtorrent") + (version "0.9.4") + (source (origin + (method url-fetch) + (uri (string-append + "http://libtorrent.rakshasa.no/downloads/rtorrent-" + version ".tar.gz")) + (sha256 + (base32 + "113yrrac75vqi4g8r6bgs0ggjllj9bkg9shv08vqzdhkwqg2q2mw")))) + (build-system gnu-build-system) + (inputs `(("libtorrent" ,libtorrent) + ("ncurses" ,ncurses) + ("curl" ,curl) + ("cyrus-sasl" ,cyrus-sasl) + ("openssl" ,openssl) + ("zlib" ,zlib) + ("libgcrypt" ,libgcrypt))) + (native-inputs `(("pkg-config" ,pkg-config) + ("cppunit" ,cppunit))) + (synopsis "BitTorrent client with ncurses interface") + (description + "rTorrent is a BitTorrent client with an ncurses interface. It supports +full encryption, DHT, PEX, and Magnet Links. It can also be controlled via +XML-RPC over SCGI.") + (home-page "http://libtorrent.rakshasa.no/") + (license l:gpl2))) -- 2.1.2