Merge remote-tracking branch 'upstream/master' into staging

2 files changed, 38 insertions, 50 deletions

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 00ec22986179..335400b80efc 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,39 @@
-args@{ callPackage, ... }:
+{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
 
-callPackage (import ./generic.nix {
-  version = "1.1.6";
-  sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7";
-}) args
+stdenv.mkDerivation rec {
+  name = "libtorrent-rasterbar-${version}";
+  version = "1.1.7";
+
+  src =
+    let formattedVersion = lib.replaceChars ["."] ["_"] version;
+    in fetchurl {
+      url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
+      sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
+    };
+
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ boost openssl zlib python libiconv geoip ];
+
+  preConfigure = "./autotool.sh";
+
+  configureFlags = [
+    "--enable-python-binding"
+    "--with-libgeoip=system"
+    "--with-libiconv=yes"
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-libiconv=yes"
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = false; # fails to link
+
+  meta = with stdenv.lib; {
+    homepage = http://www.rasterbar.com/products/libtorrent/;
+    description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
deleted file mode 100644
index c112ab65a20d..000000000000
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-# Version specific options
-{ version, sha256, patches ? [] }:
-
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
-
-let formattedVersion = lib.replaceChars ["."] ["_"] version;
-
-in
-
-stdenv.mkDerivation rec {
-  name = "libtorrent-rasterbar-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
-    inherit sha256;
-  };
-
-  inherit patches;
-
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ boost openssl zlib python libiconv geoip ];
-
-  preConfigure = "./autotool.sh";
-
-  configureFlags = [ 
-    "--enable-python-binding"
-    "--with-libgeoip=system"
-    "--with-libiconv=yes"
-    "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.out}/lib"
-    "--with-libiconv=yes"
-  ];
-
-  enableParallelBuilding = true;
-
-  doCheck = false; # fails to link
-
-  meta = with stdenv.lib; {
-    homepage = http://www.rasterbar.com/products/libtorrent/;
-    description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.unix;
-  };
-}