cleanups

NixOS · Aug 2, 2018 · eba882a · eba882a
1 parent 2428f5d
commit eba882a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
@@ -12,8 +12,9 @@ buildPythonPackage rec {
 
   # Fix tests: first requires network access, second is a bug (reported upstream)
   preConfigure = ''
-    substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
-    substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
+    substituteInPlace tests.py \
+      --replace "pypandoc.convert(url, 'html')" "'GPL2 license'" \
+      --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
   '';
 
   LC_ALL="en_US.UTF-8";
@@ -22,12 +23,14 @@ buildPythonPackage rec {
 
   buildInputs = [ pandoc texlive.combined.scheme-small haskellPackages.pandoc-citeproc glibcLocales ];
 
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Thin wrapper for pandoc";
     homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
     maintainers = with maintainers; [ bennofs ];
 
-    broken = true; # incompatible with pandoc v2
+    # broken = true; # incompatible with pandoc v2
   };
 }
diff --git a/pkgs/development/python-modules/rlp/default.nix b/pkgs/development/python-modules/rlp/default.nix
@@ -1,6 +1,27 @@
-{ lib, fetchPypi, buildPythonPackage, pytest }:
+{ lib, fetchPypi, buildPythonPackage, pypandoc, pytest }:
 
-buildPythonPackage rec {
+let
+  setuptools-markdown = buildPythonPackage rec {
+    pname = "setuptools-markdown";
+    version = "0.2";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0xzx2krdn2g1kw949mvxkxkc1gflpqmrj9lxdnvdpds3wds66nh6";
+    };
+    propagatedBuildInputs = [ pypandoc ];
+  };
+
+  eth-utils = buildPythonPackage rec {
+    pname = "eth-utils";
+    version = "1.0.3";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1d79narwn4wgcyz4k8c306xfhwllz2rhd3591g4f9rx7zpd1pdqf";
+    };
+    propagatedBuildInputs = [ setuptools-markdown ];
+  };
+
+in buildPythonPackage rec {
   pname = "rlp";
   version = "1.0.1";
 
@@ -10,7 +31,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ pytest ];
-  propagatedBuildInputs = [ ];
+  propagatedBuildInputs = [ setuptools-markdown eth-utils ];
 
   meta = {
     description = "A package for encoding and decoding data in and from Recursive Length Prefix notation";