[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/24: gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc.
From: |
guix-commits |
Subject: |
21/24: gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc. |
Date: |
Fri, 8 Oct 2021 03:20:55 -0400 (EDT) |
lbraun pushed a commit to branch master
in repository guix.
commit e51a3f4a727d8bd74ccef6322a422c7e8a421394
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Tue Oct 5 19:08:36 2021 +0200
gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc.
* gnu/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch: Add patch.
* gnu/local.mk: Register it.
* gnu/packages/bioinformatics.scm (pigx-sars-cov2-ww)[source]: Use it.
[native-inputs]: Add automake/autoconf.
---
gnu/local.mk | 1 +
gnu/packages/bioinformatics.scm | 12 +++++++-
.../patches/pigx-sars-cov2-ww-no-citeproc.patch | 33 ++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c34da97..9c8a777 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1600,6 +1600,7 @@ dist_patch_DATA =
\
%D%/packages/patches/picprog-non-intel-support.patch \
%D%/packages/patches/pidgin-add-search-path.patch \
%D%/packages/patches/pigx-bsseq-no-citeproc.patch \
+ %D%/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch \
%D%/packages/patches/pinball-system-ltdl.patch \
%D%/packages/patches/pingus-boost-headers.patch \
%D%/packages/patches/pingus-sdl-libs-config.patch \
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 63e9143..ed4470e 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10783,8 +10783,18 @@ based methods.")
"/pigx_sars-cov2-ww-" version ".tar.gz"))
(sha256
(base32
- "1hhdbwsnl0d37lrmisw5hr630xr8s41qvxflm05anh11rj8n22yw"))))
+ "1hhdbwsnl0d37lrmisw5hr630xr8s41qvxflm05anh11rj8n22yw"))
+ (patches (search-patches
"pigx-sars-cov2-ww-no-citeproc.patch"))))
(build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'bootstrap 'autoreconf
+ (lambda _
+ (invoke "autoreconf" "-vif"))))))
+ (native-inputs
+ `(("automake" ,automake)
+ ("autoconf" ,autoconf)))
(inputs
`(("bash-minimal" ,bash-minimal)
("bwa" ,bwa)
diff --git a/gnu/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch
b/gnu/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch
new file mode 100644
index 0000000..3f34bca
--- /dev/null
+++ b/gnu/packages/patches/pigx-sars-cov2-ww-no-citeproc.patch
@@ -0,0 +1,33 @@
+diff -Naur pigx_sars-cov2-ww-0.0.3/configure.ac
pigx_sars-cov2-ww-0.0.3.patched/configure.ac
+--- pigx_sars-cov2-ww-0.0.3/configure.ac 2021-06-10 10:12:00.552889984
+0200
++++ pigx_sars-cov2-ww-0.0.3.patched/configure.ac 2021-10-05
14:52:32.318695129 +0200
+@@ -50,7 +50,6 @@
+ find_or_override_prog([MULTIQC], [multiqc])
+ find_or_override_prog([WGET], [wget])
+ find_or_override_prog([PANDOC], [pandoc])
+-find_or_override_prog([PANDOC_CITEPROC], [pandoc-citeproc])
+
+ AC_ARG_ENABLE([r-packages-check],
+ AS_HELP_STRING([--disable-r-packages-check], [Do not check any R
packages.]),
+diff -Naur pigx_sars-cov2-ww-0.0.3/Makefile.in
pigx_sars-cov2-ww-0.0.3.patched/Makefile.in
+--- pigx_sars-cov2-ww-0.0.3/Makefile.in 2021-08-05 16:33:59.164123383
+0200
++++ pigx_sars-cov2-ww-0.0.3.patched/Makefile.in 2021-10-05
14:52:41.272958547 +0200
+@@ -402,7 +402,6 @@
+ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANDOC = @PANDOC@
+-PANDOC_CITEPROC = @PANDOC_CITEPROC@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PRINSEQ = @PRINSEQ@
+ PYTHON = @PYTHON@
+diff -Naur pigx_sars-cov2-ww-0.0.3/pigx-common/common/pigx-runner.in
pigx_sars-cov2-ww-0.0.3.patched/pigx-common/common/pigx-runner.in
+--- pigx_sars-cov2-ww-0.0.3/pigx-common/common/pigx-runner.in 2021-07-30
11:10:17.913115902 +0200
++++ pigx_sars-cov2-ww-0.0.3.patched/pigx-common/common/pigx-runner.in
2021-10-05 14:52:23.602438714 +0200
+@@ -379,7 +379,6 @@
+ if path.exists(bin): shutil.rmtree(bin)
+ os.makedirs(bin, exist_ok=True)
+ os.symlink('@PANDOC@', path.join(bin, "pandoc"))
+- os.symlink('@PANDOC_CITEPROC@', path.join(bin, "pandoc-citeproc"))
+ os.symlink('@RSCRIPT@', path.join(bin, "Rscript"))
+ os.environ['PATH'] = path.abspath(bin) + ":" + os.environ['PATH']
+ os.environ['PIGX_PATH'] = path.abspath(bin) + ":" + os.environ['PATH']
- 12/24: gnu: hedgewars: Fix build., (continued)
- 12/24: gnu: hedgewars: Fix build., guix-commits, 2021/10/08
- 15/24: gnu: idris: Fix build., guix-commits, 2021/10/08
- 13/24: gnu: ruby-pandoc-ruby: Disable tests., guix-commits, 2021/10/08
- 14/24: gnu: ghc-silently: Remove unused input., guix-commits, 2021/10/08
- 16/24: gnu: ngless: Fix build., guix-commits, 2021/10/08
- 17/24: gnu: python-pypandoc: Upgrade to 1.6.4., guix-commits, 2021/10/08
- 18/24: gnu: ghc-repline: Remove version 0.2.0.0., guix-commits, 2021/10/08
- 19/24: gnu: ghc-haskeline: Remove version postfix from variable name., guix-commits, 2021/10/08
- 22/24: gnu: pigx-chipseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/08
- 20/24: gnu: pigx-bsseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/08
- 21/24: gnu: pigx-sars-cov2-ww: Remove dependency on pandoc-citeproc.,
guix-commits <=
- 23/24: gnu: pigx-rnaseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/08
- 24/24: gnu: pigx-scrnaseq: Remove dependency on pandoc-citeproc., guix-commits, 2021/10/08