Merge pull request #35204 from dotlambda/pypandoc

pythonPackages.pypandoc: mark as broken

authored by Frederik Rietdijk and committed by GitHub 125a7211 6f497c65

+19 -6
+2 -1
pkgs/development/python-modules/pypandoc/default.nix
··· 4 buildPythonPackage rec { 5 pname = "pypandoc"; 6 version = "1.4"; 7 - name = "${pname}-${version}"; 8 9 src = fetchPypi { 10 inherit pname version; ··· 28 homepage = https://github.com/bebraw/pypandoc; 29 license = licenses.mit; 30 maintainers = with maintainers; [ bennofs ]; 31 }; 32 }
··· 4 buildPythonPackage rec { 5 pname = "pypandoc"; 6 version = "1.4"; 7 8 src = fetchPypi { 9 inherit pname version; ··· 27 homepage = https://github.com/bebraw/pypandoc; 28 license = licenses.mit; 29 maintainers = with maintainers; [ bennofs ]; 30 + 31 + broken = true; # incompatible with pandoc v2 32 }; 33 }
+17 -5
pkgs/development/python-modules/pyrtlsdr/default.nix
··· 1 { lib 2 , buildPythonPackage 3 , fetchPypi 4 , rtl-sdr 5 - , pypandoc 6 - , pandoc 7 }: 8 9 buildPythonPackage rec { 10 pname = "pyrtlsdr"; 11 version = "0.2.7"; 12 - name = "${pname}-${version}"; 13 14 src = fetchPypi { 15 inherit pname version; 16 sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da"; 17 }; 18 19 - buildInputs = [ pypandoc pandoc ]; 20 21 postPatch = '' 22 sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py ··· 31 license = licenses.gpl3; 32 platforms = platforms.linux; 33 maintainers = with maintainers; [ bjornfor ]; 34 - }; 35 }
··· 1 { lib 2 , buildPythonPackage 3 , fetchPypi 4 + , fetchpatch 5 , rtl-sdr 6 + , m2r 7 }: 8 9 buildPythonPackage rec { 10 pname = "pyrtlsdr"; 11 version = "0.2.7"; 12 13 src = fetchPypi { 14 inherit pname version; 15 sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da"; 16 }; 17 18 + # Replace pypandoc dependency by m2r 19 + # See https://github.com/roger-/pyrtlsdr/pull/78 20 + patches = [ 21 + (fetchpatch { 22 + url = "${meta.homepage}/commit/2b7df0b.patch"; 23 + sha256 = "04h5z80969jgdgrf98b9ps56sybms09xacvmj6rwcfrmanli8rgf"; 24 + }) 25 + (fetchpatch { 26 + url = "${meta.homepage}/commit/97dc3d0.patch"; 27 + sha256 = "1v1j0n91jwpsiam2j34yj71z4h39cvk4gi4565zgjrzsq6xr93i0"; 28 + }) 29 + ]; 30 + 31 + nativeBuildInputs = [ m2r ]; 32 33 postPatch = '' 34 sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py ··· 43 license = licenses.gpl3; 44 platforms = platforms.linux; 45 maintainers = with maintainers; [ bjornfor ]; 46 + }; 47 }