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

2017-09-02 11:10:52 +02:00
parent 0cdbd2d662 3ff173ffde
commit d0dab8a330
341 changed files with 9615 additions and 5193 deletions
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:

 python27Packages.buildPythonApplication rec {
-  version = "2.9.0";
+  version = "2.16.0";
  name = "fanficfare-${version}";
  nameprefix = "";

  src = fetchurl {
    url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "781e9095d8152345a6106135e87c46eb306ff234b847de5073faca2f78544398";
+    sha256 = "0c31z7w4b3wz5nahsmnfhvp3srprfsqbp3zyngw4cqw3dm17kvvi";
  };

  propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];