[bug#52422] [PATCH] gnu: Add bibutils.

[bug#52422] [PATCH] gnu: Add bibutils.

[Liliana Marie Prikler]

* gnu/packages/textutils.scm (bibutils): New variable.
---
 gnu/packages/textutils.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index bbad8ce867..11233446af 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1146,6 +1146,40 @@ (define-public odt2txt
 OpenDocument presentations (*.odp).")
     (license license:gpl2)))
 
+(define-public bibutils
+  (package
+    (name "bibutils")
+    (version "7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/bibutils/"
+                                  "bibutils_" version "_src.tgz"))
+
+              (sha256
+               (base32
+                "1hxmwjjzw48w6hdh2x7ybkrhi1xngd55i67hrrd3wswa3vpql0kf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (list "--install-dir" (string-append (assoc-ref %outputs "out") "/bin")
+             "--install-lib" (string-append (assoc-ref %outputs "out") "/lib")
+             "--dynamic")
+       #:make-flags (list (string-append "CC=" ,(cc-for-target))
+                          (string-append "LDFLAGSIN=-Wl,-rpath="
+                                         (assoc-ref %outputs "out") "/lib"))
+       #:test-target "test"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key configure-flags #:allow-other-keys)
+             ;; configure script is ill-formed, invoke it manually
+             (apply invoke "sh" "./configure" configure-flags))))))
+    (home-page "https://bibutils.sourceforge.io/")
+    (synopsis "Convert between various bibliography formats")
+    (description "This package provides converters for various bibliography
+formats (e.g. Bibtex, RIS, ...) using a common XML intermediate.")
+    (license license:gpl2)))
+
 (define-public opencc
   (package
     (name "opencc")
-- 
2.34.0

[bug#52422] [PATCH v2 1/2] gnu: Add bibutils.

[Liliana Marie Prikler]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2722 bytes --]

* gnu/packages/textutils.scm (bibutils): New variable.
---
Am Mittwoch, dem 22.12.2021 um 22:42 +0100 schrieb Ludovic Courtès:
> Bonus points if you change that to:
> 
>   (list #:configure-flags
>         #~(list … #$output …)
>         …)
Watch my street cred go up as I mix quasiquote and gexp 😎
On a related note, is it already known that you can't use
(arguments #~(list ...))?

> GPLv2-only?
Yes.  They don't copypasta the full license blurb, but all file headers
say that the source code is distributed under "GPL version 2".

 gnu/packages/textutils.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 49fcdad47b..a7bff73383 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -44,6 +44,7 @@ (define-module (gnu packages textutils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix git-download)
   #:use-module (guix build-system ant)
   #:use-module (guix build-system gnu)
@@ -1137,6 +1138,40 @@ (define-public odt2txt
 OpenDocument presentations (*.odp).")
     (license license:gpl2)))
 
+(define-public bibutils
+  (package
+    (name "bibutils")
+    (version "7.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/bibutils/"
+                                  "bibutils_" version "_src.tgz"))
+
+              (sha256
+               (base32
+                "1hxmwjjzw48w6hdh2x7ybkrhi1xngd55i67hrrd3wswa3vpql0kf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       ,#~(list "--install-dir" (string-append #$output "/bin")
+                "--install-lib" (string-append #$output "/lib")
+                "--dynamic")
+       #:make-flags
+       ,#~(list (string-append "CC=" #+(cc-for-target))
+                (string-append "LDFLAGSIN=-Wl,-rpath=" #$output "/lib"))
+       #:test-target "test"
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key configure-flags #:allow-other-keys)
+             ;; configure script is ill-formed, invoke it manually
+             (apply invoke "sh" "./configure" configure-flags))))))
+    (home-page "https://bibutils.sourceforge.io/")
+    (synopsis "Convert between various bibliography formats")
+    (description "This package provides converters for various bibliography
+formats (e.g. Bibtex, RIS, ...) using a common XML intermediate.")
+    (license license:gpl2)))
+
 (define-public opencc
   (package
     (name "opencc")
-- 
2.34.0

[bug#52422] [PATCH] gnu: Add bibutils.

[Ludovic Courtès]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> * gnu/packages/textutils.scm (bibutils): New variable.

LGTM!

> +    (arguments
> +     `(#:configure-flags
> +       (list "--install-dir" (string-append (assoc-ref %outputs "out") "/bin")
> +             "--install-lib" (string-append (assoc-ref %outputs "out") "/lib")

Bonus points if you change that to:

  (list #:configure-flags
        #~(list … #$output …)
        …)

> +    (home-page "https://bibutils.sourceforge.io/")
> +    (synopsis "Convert between various bibliography formats")
> +    (description "This package provides converters for various bibliography
> +formats (e.g. Bibtex, RIS, ...) using a common XML intermediate.")
> +    (license license:gpl2)))

GPLv2-only?

Thanks,
Ludo’.

[bug#52422] [PATCH v2 2/2] gnu: Move go-github-com-aswinkarthik-csvdiff to textutils.

[Liliana Marie Prikler]

This fixes a build error caused by cross-module use of deprecated-package.

* gnu/packages/golang.scm (go-github-com-aswinkarthik-csvdiff): Move from
here...
* gnu/packages/textutils.scm (go-github-com-aswinkarthik-csvdiff): ... to here.
---
 gnu/packages/golang.scm    | 3 ---
 gnu/packages/textutils.scm | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f716c69d13..87e4d5d3d0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -8688,9 +8688,6 @@ (define-public go-github-com-oneofone-xxhash
 non-cryptographic hash algorithm, working at speeds close to RAM limits.")
     (license license:asl2.0)))
 
-(define-public go-github-com-aswinkarthik-csvdiff
-  (deprecated-package "go-github-com-aswinkarthik-csvdiff" csvdiff))
-
 (define-public go-gopkg-in-djherbis-times-v1
   (package
     (name "go-gopkg-in-djherbis-times-v1")
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index a7bff73383..01ac161248 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1417,3 +1417,6 @@ (define-public csvdiff
 JSON for post-processing
 @end itemize")
     (license license:expat)))
+
+(define-public go-github-com-aswinkarthik-csvdiff
+  (deprecated-package "go-github-com-aswinkarthik-csvdiff" csvdiff))
-- 
2.34.0

[bug#52422] [PATCH v2 1/2] gnu: Add bibutils.

[Ludovic Courtès]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> * gnu/packages/textutils.scm (bibutils): New variable.
> ---
> Am Mittwoch, dem 22.12.2021 um 22:42 +0100 schrieb Ludovic Courtès:
>> Bonus points if you change that to:
>> 
>>   (list #:configure-flags
>>         #~(list … #$output …)
>>         …)
> Watch my street cred go up as I mix quasiquote and gexp 😎

I try to avoid that because I’m think it can be quite confusing and
intimidating, especially when you end up with sequences like ,#~.
That’s a discussion we should have, but I’m in favor of the above style.

> On a related note, is it already known that you can't use
> (arguments #~(list ...))?

Yes, that’s because ‘arguments’ is literally a list of arguments passed
to the build system with ‘apply’.

>> GPLv2-only?
> Yes.  They don't copypasta the full license blurb, but all file headers
> say that the source code is distributed under "GPL version 2".

V2-only then.

Thanks!

Ludo’.

[bug#52422] [PATCH v2 2/2] gnu: Move go-github-com-aswinkarthik-csvdiff to textutils.

[Ludovic Courtès]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> This fixes a build error caused by cross-module use of deprecated-package.
>
> * gnu/packages/golang.scm (go-github-com-aswinkarthik-csvdiff): Move from
> here...
> * gnu/packages/textutils.scm (go-github-com-aswinkarthik-csvdiff): ... to here.

Good catch, go for it!

Ludo’.

bug#52422: [PATCH v2 1/2] gnu: Add bibutils.

[Liliana Marie Prikler]

Am Freitag, dem 24.12.2021 um 15:51 +0100 schrieb Ludovic Courtès:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:
> 
> > * gnu/packages/textutils.scm (bibutils): New variable.
> > ---
> > Am Mittwoch, dem 22.12.2021 um 22:42 +0100 schrieb Ludovic Courtès:
> > > Bonus points if you change that to:
> > > 
> > >   (list #:configure-flags
> > >         #~(list … #$output …)
> > >         …)
> > Watch my street cred go up as I mix quasiquote and gexp 😎
> 
> I try to avoid that because I’m think it can be quite confusing and
> intimidating, especially when you end up with sequences like ,#~.
> That’s a discussion we should have, but I’m in favor of the above
> style.
Fair enough, I've pushed it with the style you suggested.
>