Merge pull request #35204 from dotlambda/pypandoc

pythonPackages.pypandoc: mark as broken
This commit is contained in:
Frederik Rietdijk 2018-02-20 11:00:53 +00:00 committed by GitHub
commit 125a721175
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 6 deletions

View file

@ -4,7 +4,6 @@
buildPythonPackage rec {
pname = "pypandoc";
version = "1.4";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
@ -28,5 +27,7 @@ buildPythonPackage rec {
homepage = https://github.com/bebraw/pypandoc;
license = licenses.mit;
maintainers = with maintainers; [ bennofs ];
broken = true; # incompatible with pandoc v2
};
}

View file

@ -1,22 +1,34 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, rtl-sdr
, pypandoc
, pandoc
, m2r
}:
buildPythonPackage rec {
pname = "pyrtlsdr";
version = "0.2.7";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da";
};
buildInputs = [ pypandoc pandoc ];
# Replace pypandoc dependency by m2r
# See https://github.com/roger-/pyrtlsdr/pull/78
patches = [
(fetchpatch {
url = "${meta.homepage}/commit/2b7df0b.patch";
sha256 = "04h5z80969jgdgrf98b9ps56sybms09xacvmj6rwcfrmanli8rgf";
})
(fetchpatch {
url = "${meta.homepage}/commit/97dc3d0.patch";
sha256 = "1v1j0n91jwpsiam2j34yj71z4h39cvk4gi4565zgjrzsq6xr93i0";
})
];
nativeBuildInputs = [ m2r ];
postPatch = ''
sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
@ -31,5 +43,5 @@ buildPythonPackage rec {
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ bjornfor ];
};
};
}