From 31fda20387647ea9d90e4c621b5f101d800205c2 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Fri, 18 Mar 2022 18:34:47 +0100 Subject: [PATCH 1/7] add self to maintainers --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e26d693c39c..914c75902b6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9904,6 +9904,12 @@ fingerprint = "48AD DE10 F27B AFB4 7BB0 CCAF 2D25 95A0 0D08 ACE0"; }]; }; + ppenguin = { + name = "Jeroen Versteeg"; + email = "hieronymusv@gmail.com"; + github = "ppenguin"; + githubId = 17690377; + }; ppom = { name = "Paco Pompeani"; email = "paco@ecomail.io"; From 36c879d18cb3f4e2f6dcdd5e7d646c69138187c1 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:23:47 +0200 Subject: [PATCH 2/7] python3Packages.pandoc-xnos: init at 2.5.0 --- .../python-modules/pandoc-xnos/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/pandoc-xnos/default.nix diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix new file mode 100644 index 00000000000..28044d4bc24 --- /dev/null +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -0,0 +1,32 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pandocfilters +, psutil +}: + +buildPythonPackage rec { + pname = "pandoc-xnos"; + version = "2.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-beiGvN0DS6s8wFjcDKozDuwAM2OApX3lTRaUDRUqLeU="; + }; + + propagatedBuildInputs = [ pandocfilters psutil ]; + + doCheck = true; + + pythonImportsCheck = [ "pandocxnos" ]; + + meta = with lib; { + description = "Pandoc filter suite providing facilities for cross-referencing in markdown documents"; + homepage = "https://github.com/tomduck/pandoc-xnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 720f463312f..8317673110f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5886,6 +5886,8 @@ in { pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + pandoc-xnos = callPackage ../development/python-modules/pandoc-xnos { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; panel = callPackage ../development/python-modules/panel { }; From 5466f3931f5041b8cc91cf534c512a97fdaa9fb7 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:24:51 +0200 Subject: [PATCH 3/7] pandoc-eqnos: init at 2.5.0 --- pkgs/tools/misc/pandoc-eqnos/default.nix | 30 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/pandoc-eqnos/default.nix diff --git a/pkgs/tools/misc/pandoc-eqnos/default.nix b/pkgs/tools/misc/pandoc-eqnos/default.nix new file mode 100644 index 00000000000..310826c35b0 --- /dev/null +++ b/pkgs/tools/misc/pandoc-eqnos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-eqnos"; + version = "2.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-7GQdfGHhtQs6LZK+ZyMmcPSkoFfBWmATTMejMiFcS7Y="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering equations and equation references"; + homepage = "https://github.com/tomduck/pandoc-eqnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1584e5c0d9..9c86a2ffdb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8332,7 +8332,8 @@ with pkgs; pandoc-plantuml-filter = python3Packages.callPackage ../tools/misc/pandoc-plantuml-filter { }; - panicparse = callPackage ../tools/misc/panicparse { }; + # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality + pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; patray = callPackage ../tools/audio/patray { }; From 2e563123bf6ed58fa85626686a27208a9c96348d Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:25:55 +0200 Subject: [PATCH 4/7] pandoc-fignos: init at 2.4.0 --- pkgs/tools/misc/pandoc-fignos/default.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-fignos/default.nix diff --git a/pkgs/tools/misc/pandoc-fignos/default.nix b/pkgs/tools/misc/pandoc-fignos/default.nix new file mode 100644 index 00000000000..846d1abe8d7 --- /dev/null +++ b/pkgs/tools/misc/pandoc-fignos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-fignos"; + version = "2.4.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-eDwAW0nLB4YqrWT3Ajt9bmX1A43wl+tOPm2St5VpCLk="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering figures and figure references"; + homepage = "https://github.com/tomduck/pandoc-fignos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c86a2ffdb9..bb626f1de8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8334,6 +8334,7 @@ with pkgs; # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; + pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; patray = callPackage ../tools/audio/patray { }; From 62511c6de31dd81c2ea07a4cd37e38cb6dee5b29 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:27:00 +0200 Subject: [PATCH 5/7] pandoc-secnos: init at 2.2.2 --- pkgs/tools/misc/pandoc-secnos/default.nix | 34 ++++++++++++++++ .../pandoc-secnos/patch/fix-manifest.patch | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 3 files changed, 74 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-secnos/default.nix create mode 100644 pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch diff --git a/pkgs/tools/misc/pandoc-secnos/default.nix b/pkgs/tools/misc/pandoc-secnos/default.nix new file mode 100644 index 00000000000..95c67dde0ec --- /dev/null +++ b/pkgs/tools/misc/pandoc-secnos/default.nix @@ -0,0 +1,34 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-secnos"; + version = "2.2.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-J9KLZvioYM3Pl2UXjrEgd4PuLTwCLYy9SsJIzgw5/jU="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + patches = [ + ./patch/fix-manifest.patch + ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering sections and section references"; + homepage = "https://github.com/tomduck/pandoc-secnos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch new file mode 100644 index 00000000000..782e5b5e07c --- /dev/null +++ b/pkgs/tools/misc/pandoc-secnos/patch/fix-manifest.patch @@ -0,0 +1,39 @@ +From 165ee1f4c1208636254392335d34934dc50d273e Mon Sep 17 00:00:00 2001 +From: ppenguin +Date: Tue, 15 Mar 2022 23:15:07 +0100 +Subject: [PATCH] fix setup.py to work in nixpkgs + +--- + setup.py | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/setup.py b/setup.py +index d705846..d7345a2 100644 +--- a/setup.py ++++ b/setup.py +@@ -42,10 +42,10 @@ + + author='Thomas J. Duck', + author_email='tomduck@tomduck.ca', +- description='Equation number filter for pandoc', ++ description='Section number filter for pandoc', + long_description=DESCRIPTION, + license='GPL', +- keywords='pandoc equation numbers filter', ++ keywords='pandoc section numbers filter', + url='https://github.com/tomduck/pandoc-secnos', + download_url='https://github.com/tomduck/pandoc-secnos/tarball/' + \ + __version__, +@@ -63,12 +63,3 @@ + 'Programming Language :: Python' + ] + ) +- +-# Check that the pandoc-secnos script is on the PATH +-if not shutil.which('pandoc-secnos'): +- msg = """ +- ERROR: `pandoc-secnos` script not found. This will need to +- be corrected. If you need help, please file an Issue at +- https://github.com/tomduck/pandoc-secnos/issues.\n""" +- print(textwrap.dedent(msg)) +- sys.exit(-1) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb626f1de8d..865c13b933b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8335,6 +8335,7 @@ with pkgs; # pandoc-*nos is a filter suite, where pandoc-xnos has all functionality and the others are used for only specific functionality pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; + pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { }; patray = callPackage ../tools/audio/patray { }; From 0a6a3c0b3375e4d3cdd58c20bc8650b361f81116 Mon Sep 17 00:00:00 2001 From: Jeroen Versteeg Date: Fri, 6 May 2022 18:27:40 +0200 Subject: [PATCH 6/7] pandoc-tablenos: init at 2.3.0 --- pkgs/tools/misc/pandoc-tablenos/default.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/misc/pandoc-tablenos/default.nix diff --git a/pkgs/tools/misc/pandoc-tablenos/default.nix b/pkgs/tools/misc/pandoc-tablenos/default.nix new file mode 100644 index 00000000000..f3d67826a45 --- /dev/null +++ b/pkgs/tools/misc/pandoc-tablenos/default.nix @@ -0,0 +1,30 @@ +{ buildPythonApplication +, fetchFromGitHub +, lib +, pandoc-xnos +}: + +buildPythonApplication rec { + pname = "pandoc-tablenos"; + version = "2.3.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tomduck"; + repo = pname; + rev = version; + sha256 = "sha256-FwzsRziY3PoySo9hIFuLw6tOO9oQij6oQEyoY8HgnII="; + }; + + propagatedBuildInputs = [ pandoc-xnos ]; + + # Different pandoc executables are not available + doCheck = false; + + meta = with lib; { + description = "Standalone pandoc filter from the pandoc-xnos suite for numbering tables and table references"; + homepage = "https://github.com/tomduck/pandoc-tablenos"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ppenguin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 865c13b933b..67acc8a0197 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8336,6 +8336,7 @@ with pkgs; pandoc-eqnos = python3Packages.callPackage ../tools/misc/pandoc-eqnos { }; pandoc-fignos = python3Packages.callPackage ../tools/misc/pandoc-fignos { }; pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { }; + pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { }; patray = callPackage ../tools/audio/patray { }; From 77e956ef7685ed489bcb1e775065af7610e4354d Mon Sep 17 00:00:00 2001 From: ppenguin Date: Wed, 11 May 2022 18:55:12 +0200 Subject: [PATCH 7/7] Update pkgs/development/python-modules/pandoc-xnos/default.nix Co-authored-by: Sandro --- pkgs/development/python-modules/pandoc-xnos/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pandoc-xnos/default.nix b/pkgs/development/python-modules/pandoc-xnos/default.nix index 28044d4bc24..ce365708b35 100644 --- a/pkgs/development/python-modules/pandoc-xnos/default.nix +++ b/pkgs/development/python-modules/pandoc-xnos/default.nix @@ -19,8 +19,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pandocfilters psutil ]; - doCheck = true; - pythonImportsCheck = [ "pandocxnos" ]; meta = with lib; {