uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,33 @@
{ lib, substituteAll, buildPythonPackage, fetchPypi
, pandoc, texlive
}:
buildPythonPackage rec {
pname = "pypandoc";
version = "1.7.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-gCwmquF7ZBNsbQBpSdjOGDp9TZ+9Ty0FHmb0+59FylA=";
};
patches = [
(substituteAll {
src = ./static-pandoc-path.patch;
pandoc = "${lib.getBin pandoc}/bin/pandoc";
pandocVersion = pandoc.version;
})
./skip-tests.patch
];
checkInputs = [
texlive.combined.scheme-small
];
meta = with lib; {
description = "Thin wrapper for pandoc";
homepage = "https://github.com/NicklasTegner/pypandoc";
license = licenses.mit;
maintainers = with maintainers; [ sternenseemann bennofs ];
};
}

View file

@ -0,0 +1,12 @@
diff --git a/tests.py b/tests.py
index deb50e0..aede281 100755
--- a/tests.py
+++ b/tests.py
@@ -179,6 +179,7 @@ class TestPypandoc(unittest.TestCase):
received = pypandoc.convert_file(file_url, 'rst')
self.assertEqualExceptForNewlineEnd(expected, received)
+ @unittest.skip("no network access during checkPhase")
def test_basic_conversion_from_http_url(self):
url = 'https://raw.githubusercontent.com/bebraw/pypandoc/master/README.md'
received = pypandoc.convert_file(url, 'html')

View file

@ -0,0 +1,11 @@
diff --git a/pypandoc/__init__.py b/pypandoc/__init__.py
index 6d5b79b..65437aa 100644
--- a/pypandoc/__init__.py
+++ b/pypandoc/__init__.py
@@ -582,4 +582,4 @@ def clean_pandocpath_cache():
-__version = None
+__version = "@pandocVersion@"
-__pandoc_path = None
+__pandoc_path = "@pandoc@"