diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/python-modules/pypandoc | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pypandoc')
3 files changed, 13 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index 32bada43c154..eb7287e4a1b0 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -1,14 +1,16 @@ -{ lib, substituteAll, buildPythonPackage, fetchPypi +{ lib, substituteAll, buildPythonPackage, fetchFromGitHub , pandoc, texlive }: buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.4"; + version = "1.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-KN4j9kbZ6ARAPGth180yptdso1arx563IXvb/2dI+G4="; + src = fetchFromGitHub { + owner = "NicklasTegner"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1vQmONQFJrjptwVVjw25Wyt59loatjScsdnSax+q/f8="; }; patches = [ diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch b/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch index 201c5105c53b..b7788f5d46e5 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch @@ -1,8 +1,8 @@ diff --git a/tests.py b/tests.py -index deb50e0..aede281 100755 +index 704f049..ef68728 100755 --- a/tests.py +++ b/tests.py -@@ -179,6 +179,7 @@ class TestPypandoc(unittest.TestCase): +@@ -225,6 +225,7 @@ class TestPypandoc(unittest.TestCase): received = pypandoc.convert_file(file_url, 'rst') self.assertEqualExceptForNewlineEnd(expected, received) diff --git a/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch b/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch index 8f992185d610..cff02b01b35d 100644 --- a/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch +++ b/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch @@ -1,11 +1,12 @@ diff --git a/pypandoc/__init__.py b/pypandoc/__init__.py -index 6d5b79b..65437aa 100644 +index b8f4e9a..295e182 100644 --- a/pypandoc/__init__.py +++ b/pypandoc/__init__.py -@@ -582,4 +582,4 @@ def clean_pandocpath_cache(): +@@ -771,5 +771,5 @@ def clean_pandocpath_cache(): + __pandoc_path = None -__version = None -+__version = "@pandocVersion@" -__pandoc_path = None ++__version = "@pandocVersion@" +__pandoc_path = "@pandoc@" |