[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Oleg Pykhalov]

* gnu/packages/cdrom.scm (cdrkit-libre): New variable.
---
 gnu/packages/cdrom.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 027a333d6..a257ec193 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
+;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -767,3 +768,39 @@ to produce new complete file system images or add-on images to be appended
 to the read file system image.
 Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
     (license gpl2+)))
+
+(define-public cdrkit-libre
+  (package
+    (name "cdrkit-libre")
+    (version "1.1.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "0g2zyzb56czh429qy87lvaddzjnlcq8c616ddxsmsshz3clhyzrh"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     `(("bzip2" ,bzip2)
+       ("libcap" ,libcap)
+       ("perl" ,perl)
+       ("zlib" ,zlib)))
+    (arguments
+     `(#:tests? #f ;no tests
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'old-cdrecord
+           (lambda* (#:key outputs #:allow-other-keys)
+             (with-directory-excursion (string-append (assoc-ref outputs "out")
+                                                      "/bin")
+               (symlink "genisoimage" "mkisofs")
+               (symlink "wodim" "cdrecord")))))))
+    (home-page "http://cdrkit.org/")
+    (synopsis "Portable command-line CD/DVD recorder software, mostly
+compatible with cdrtools")
+    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
+blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
+data, and more.")
+    (license gpl2+)))
-- 
2.18.0

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Nils Gillmann]

Oleg Pykhalov transcribed 2.2K bytes:
> * gnu/packages/cdrom.scm (cdrkit-libre): New variable.
> ---
>  gnu/packages/cdrom.scm | 37 +++++++++++++++++++++++++++++++++++++
>  1 file changed, 37 insertions(+)
> 
> diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
> index 027a333d6..a257ec193 100644
> --- a/gnu/packages/cdrom.scm
> +++ b/gnu/packages/cdrom.scm
> @@ -10,6 +10,7 @@
>  ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
>  ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
>  ;;; Copyright © 2017 Nils Gillmann <ng0@n0.is>
> +;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -767,3 +768,39 @@ to produce new complete file system images or add-on images to be appended
>  to the read file system image.
>  Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
>      (license gpl2+)))
> +
> +(define-public cdrkit-libre
> +  (package
> +    (name "cdrkit-libre")
> +    (version "1.1.11")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
> +                    version ".tar.gz"))
> +              (sha256
> +               (base32
> +                "0g2zyzb56czh429qy87lvaddzjnlcq8c616ddxsmsshz3clhyzrh"))))
> +    (build-system cmake-build-system)
> +    (native-inputs
> +     `(("bzip2" ,bzip2)
> +       ("libcap" ,libcap)
> +       ("perl" ,perl)
> +       ("zlib" ,zlib)))
> +    (arguments
> +     `(#:tests? #f ;no tests
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'old-cdrecord
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (with-directory-excursion (string-append (assoc-ref outputs "out")
> +                                                      "/bin")
> +               (symlink "genisoimage" "mkisofs")
> +               (symlink "wodim" "cdrecord")))))))
> +    (home-page "http://cdrkit.org/")

As this is supposedly a fork or patched version, the website should point
to a repository or - if existing - website, not the upstream website.

> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
> +compatible with cdrtools")
> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
> +data, and more.")

Could we explain the difference to cdrkit here and why people would want this
probably reduced variant of it? When someone search for cdrkit, they will
get 2 results, and 1 will only differ in the homepage and the word "mostly",
more or less.

> +    (license gpl2+)))
> -- 
> 2.18.0
> 
> 
> 
> 

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

Hello Nils,

Nils Gillmann <ng0@n0.is> writes:

[…]

>> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
>> +compatible with cdrtools")
>> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
>> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
>> +data, and more.")
>
> Could we explain the difference to cdrkit here and why people would want this
> probably reduced variant of it? When someone search for cdrkit, they will
> get 2 results, and 1 will only differ in the homepage and the word "mostly",
> more or less.

I think cdrkit and cdrkit-libre not much differ based on the diff of Nix
cdrkit and Parabola cdrkit-libre tarballs.
--8<---------------cut here---------------start------------->8---
Only in cdrkit-1.1.11-nix/doc/genisoimage: README.hfs_boot
Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.8
Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.c
--8<---------------cut here---------------end--------------->8---

I assume something like “@code{cdrkit-libre} doesn't contain HFS boot
code.” in the description could work, WDYT?

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Nils Gillmann]

Oleg Pykhalov transcribed 2.1K bytes:
> Hello Nils,
> 
> Nils Gillmann <ng0@n0.is> writes:
> 
> […]
> 
> >> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
> >> +compatible with cdrtools")
> >> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
> >> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
> >> +data, and more.")
> >
> > Could we explain the difference to cdrkit here and why people would want this
> > probably reduced variant of it? When someone search for cdrkit, they will
> > get 2 results, and 1 will only differ in the homepage and the word "mostly",
> > more or less.
> 
> I think cdrkit and cdrkit-libre not much differ based on the diff of Nix
> cdrkit and Parabola cdrkit-libre tarballs.
> --8<---------------cut here---------------start------------->8---
> Only in cdrkit-1.1.11-nix/doc/genisoimage: README.hfs_boot
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.8
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.c
> --8<---------------cut here---------------end--------------->8---
> 
> I assume something like “@code{cdrkit-libre} doesn't contain HFS boot
> code.” in the description could work, WDYT?
> 
> Thanks,
> Oleg.

Thanks for looking into this.
This could work in the description.

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Ludovic Courtès]

Hi Oleg,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> * gnu/packages/cdrom.scm (cdrkit-libre): New variable.

[...]

> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
> +                    version ".tar.gz"))

Like Nils I wonder: can you explain how it differs from cdrkit?  Could
we use upstream cdrkit + snippet/patches instead of taking the source
from Parabola’s repo?

> +    (build-system cmake-build-system)
> +    (native-inputs
> +     `(("bzip2" ,bzip2)
> +       ("libcap" ,libcap)
> +       ("perl" ,perl)
> +       ("zlib" ,zlib)))

It may be that all of these should be ‘inputs’.  Could you check:

  guix gc --references $(guix build cdrkit-libre)

?  If they show up here, then ‘inputs’.

> +    (arguments
> +     `(#:tests? #f ;no tests
> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-after 'install 'old-cdrecord
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (with-directory-excursion (string-append (assoc-ref outputs "out")
> +                                                      "/bin")
> +               (symlink "genisoimage" "mkisofs")
> +               (symlink "wodim" "cdrecord")))))))

Please return #t.

> +    (home-page "http://cdrkit.org/")

Like Nils wrote, is this the right URL?

> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
> +compatible with cdrtools")

“Command-line CD/DVD recorder” is enough IMO.

> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
> +data, and more.")

Here you can mention that it’s “mostly compatible …”.
Note: “file system” (two words).  :-)

Thanks,
Ludo’.

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 3870 bytes --]

Hello Ludovic and Nils,

Thank you for review.

ludo@gnu.org (Ludovic Courtès) writes:

> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>
>> * gnu/packages/cdrom.scm (cdrkit-libre): New variable.
>
> [...]
>
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append
>> +                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
>> +                    version ".tar.gz"))
>
> Like Nils I wonder: can you explain how it differs from cdrkit?  Could
> we use upstream cdrkit + snippet/patches instead of taking the source
> from Parabola’s repo?

Comparing Nix cdrkit with Parabola cdrkit-libre tarball not much differ.
--8<---------------cut here---------------start------------->8---
$ /tmp/local$ diff -r -u cdrkit-1.1.11-nix/  cdrkit-1.1.11-parabola/
Only in cdrkit-1.1.11-nix/doc/genisoimage: README.hfs_boot
Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.8
Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.c
--8<---------------cut here---------------end--------------->8---

I probably could get a diff for apple_driver.{8,c} files, but the the
upstream URI http://cdrkit.org/releases/cdrkit.tar.gz is dead.  I'm not
sure where is a better place to fetch the release tarball except from
another GNU/Linux distribution like Parabola.

>> +    (build-system cmake-build-system)
>> +    (native-inputs
>> +     `(("bzip2" ,bzip2)
>> +       ("libcap" ,libcap)
>> +       ("perl" ,perl)
>> +       ("zlib" ,zlib)))
>
> It may be that all of these should be ‘inputs’.  Could you check:
>
>   guix gc --references $(guix build cdrkit-libre)
--8<---------------cut here---------------start------------->8---
/gnu/store/5whrhayw7kispmd103xc05vmdvsdvhqf-cdrkit-libre-1.1.11
/gnu/store/7ifc22sh86zblnzamqimgmv06idyx69v-perl-5.26.1
/gnu/store/fxiwj2wpp11sif613axdax7gmwzsg6kp-zlib-1.2.11
/gnu/store/l4lr0f5cjd0nbsaaf8b5dmcw1a1yypr3-glibc-2.27
/gnu/store/pxf13xq984jvl2nk12wmsln39a1d8jwc-libcap-2.25
/gnu/store/qhxgdgyiyq2ilvh17fqfw0njpqlg4gsc-file-5.32
/gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19
/gnu/store/rw1ilvs76rf2p4p0bi1fx3bffprwwb7g-bzip2-1.0.6
/gnu/store/vla5j7pbkpcp39lsdfsmz7m9azn48lr4-gcc-5.5.0-lib
--8<---------------cut here---------------end--------------->8---

> ?  If they show up here, then ‘inputs’.
>

Sure, I will do ‘s/native-inputs/inputs/g’.

>> +    (arguments
>> +     `(#:tests? #f ;no tests
>> +       #:phases
>> +       (modify-phases %standard-phases
>> +         (add-after 'install 'old-cdrecord
>> +           (lambda* (#:key outputs #:allow-other-keys)
>> +             (with-directory-excursion (string-append (assoc-ref outputs "out")
>> +                                                      "/bin")
>> +               (symlink "genisoimage" "mkisofs")
>> +               (symlink "wodim" "cdrecord")))))))
>
> Please return #t.

Oops, will do.

>> +    (home-page "http://cdrkit.org/")
>
> Like Nils wrote, is this the right URL?

It's a right URL, I think.  I converted recipe from Parabola, which
references the same URL [1].  Maybe I should use a Parabola repository
URL <https://repo.parabola.nu/other/cdrkit-libre/>?

>> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
>> +compatible with cdrtools")
>
> “Command-line CD/DVD recorder” is enough IMO.

OK.

>> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
>> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
>> +data, and more.")
>
> Here you can mention that it’s “mostly compatible …”.

Do you mean “creating more compatible ISO-9660 …”?

> Note: “file system” (two words).  :-)

OK.


[1]  https://git.parabola.nu/abslibre.git/tree/libre/cdrkit/PKGBUILD

Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Nils Gillmann]

Oleg Pykhalov transcribed 4.8K bytes:
> Hello Ludovic and Nils,
> 
> Thank you for review.
> 
> ludo@gnu.org (Ludovic Courtès) writes:
> 
> > Oleg Pykhalov <go.wigust@gmail.com> skribis:
> >
> >> * gnu/packages/cdrom.scm (cdrkit-libre): New variable.
> >
> > [...]
> >
> >> +    (source (origin
> >> +              (method url-fetch)
> >> +              (uri (string-append
> >> +                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
> >> +                    version ".tar.gz"))
> >
> > Like Nils I wonder: can you explain how it differs from cdrkit?  Could
> > we use upstream cdrkit + snippet/patches instead of taking the source
> > from Parabola’s repo?
> 
> Comparing Nix cdrkit with Parabola cdrkit-libre tarball not much differ.
> --8<---------------cut here---------------start------------->8---
> $ /tmp/local$ diff -r -u cdrkit-1.1.11-nix/  cdrkit-1.1.11-parabola/
> Only in cdrkit-1.1.11-nix/doc/genisoimage: README.hfs_boot
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.8
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.c
> --8<---------------cut here---------------end--------------->8---
> 
> I probably could get a diff for apple_driver.{8,c} files, but the the
> upstream URI http://cdrkit.org/releases/cdrkit.tar.gz is dead.  I'm not

archive.org could help I think.
With regards to the description, there's some history here about the split:
https://inconsolation.wordpress.com/2013/09/24/cdrtools-cdrkit-and-cdrskin-untying-the-knot/

> sure where is a better place to fetch the release tarball except from
> another GNU/Linux distribution like Parabola.

I'd try Gentoo distfiles:
http://distfiles.gentoo.org/distfiles/ or directly: https://gentoo.osuosl.org/distfiles/cdrkit-1.1.6.tar.gz

> 
> >> +    (build-system cmake-build-system)
> >> +    (native-inputs
> >> +     `(("bzip2" ,bzip2)
> >> +       ("libcap" ,libcap)
> >> +       ("perl" ,perl)
> >> +       ("zlib" ,zlib)))
> >
> > It may be that all of these should be ‘inputs’.  Could you check:
> >
> >   guix gc --references $(guix build cdrkit-libre)
> --8<---------------cut here---------------start------------->8---
> /gnu/store/5whrhayw7kispmd103xc05vmdvsdvhqf-cdrkit-libre-1.1.11
> /gnu/store/7ifc22sh86zblnzamqimgmv06idyx69v-perl-5.26.1
> /gnu/store/fxiwj2wpp11sif613axdax7gmwzsg6kp-zlib-1.2.11
> /gnu/store/l4lr0f5cjd0nbsaaf8b5dmcw1a1yypr3-glibc-2.27
> /gnu/store/pxf13xq984jvl2nk12wmsln39a1d8jwc-libcap-2.25
> /gnu/store/qhxgdgyiyq2ilvh17fqfw0njpqlg4gsc-file-5.32
> /gnu/store/rbrandv7anzjxqkr40d7fkanzssslk4b-bash-minimal-4.4.19
> /gnu/store/rw1ilvs76rf2p4p0bi1fx3bffprwwb7g-bzip2-1.0.6
> /gnu/store/vla5j7pbkpcp39lsdfsmz7m9azn48lr4-gcc-5.5.0-lib
> --8<---------------cut here---------------end--------------->8---
> 
> > ?  If they show up here, then ‘inputs’.
> >
> 
> Sure, I will do ‘s/native-inputs/inputs/g’.
> 
> >> +    (arguments
> >> +     `(#:tests? #f ;no tests
> >> +       #:phases
> >> +       (modify-phases %standard-phases
> >> +         (add-after 'install 'old-cdrecord
> >> +           (lambda* (#:key outputs #:allow-other-keys)
> >> +             (with-directory-excursion (string-append (assoc-ref outputs "out")
> >> +                                                      "/bin")
> >> +               (symlink "genisoimage" "mkisofs")
> >> +               (symlink "wodim" "cdrecord")))))))
> >
> > Please return #t.
> 
> Oops, will do.
> 
> >> +    (home-page "http://cdrkit.org/")
> >
> > Like Nils wrote, is this the right URL?
> 
> It's a right URL, I think.  I converted recipe from Parabola, which
> references the same URL [1].  Maybe I should use a Parabola repository
> URL <https://repo.parabola.nu/other/cdrkit-libre/>?

Yes, as this is the source we are pulling from then.
Imo a documentation-url and other specific URLs (donations for
developers,...) would be good. But in cases like these, use the
closest thing to a homepage with the sourcecode.

> >> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
> >> +compatible with cdrtools")
> >
> > “Command-line CD/DVD recorder” is enough IMO.
> 
> OK.
> 
> >> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
> >> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
> >> +data, and more.")
> >
> > Here you can mention that it’s “mostly compatible …”.
> 
> Do you mean “creating more compatible ISO-9660 …”?
> 
> > Note: “file system” (two words).  :-)
> 
> OK.
> 
> 
> [1]  https://git.parabola.nu/abslibre.git/tree/libre/cdrkit/PKGBUILD
> 
> Oleg.

[bug#32165] [PATCH] gnu: Add cdrkit-libre.

[Ludovic Courtès]

Hello,

Oleg Pykhalov <go.wigust@gmail.com> skribis:

> ludo@gnu.org (Ludovic Courtès) writes:
>
>> Oleg Pykhalov <go.wigust@gmail.com> skribis:
>>
>>> * gnu/packages/cdrom.scm (cdrkit-libre): New variable.
>>
>> [...]
>>
>>> +    (source (origin
>>> +              (method url-fetch)
>>> +              (uri (string-append
>>> +                    "https://repo.parabola.nu/other/cdrkit-libre/cdrkit-libre-"
>>> +                    version ".tar.gz"))
>>
>> Like Nils I wonder: can you explain how it differs from cdrkit?  Could
>> we use upstream cdrkit + snippet/patches instead of taking the source
>> from Parabola’s repo?
>
> Comparing Nix cdrkit with Parabola cdrkit-libre tarball not much differ.
>
> $ /tmp/local$ diff -r -u cdrkit-1.1.11-nix/  cdrkit-1.1.11-parabola/
> Only in cdrkit-1.1.11-nix/doc/genisoimage: README.hfs_boot
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.8
> Only in cdrkit-1.1.11-nix/genisoimage: apple_driver.c
>
>
> I probably could get a diff for apple_driver.{8,c} files, but the the
> upstream URI http://cdrkit.org/releases/cdrkit.tar.gz is dead.  I'm not
> sure where is a better place to fetch the release tarball except from
> another GNU/Linux distribution like Parabola.

Uh, indeed.  The perhaps add a comment above the URL stating that (1)
cdrkit.org is dead, and (2) cdrkit-libre removes a couple of problematic
files, with a link to this discussion.

>>> +    (home-page "http://cdrkit.org/")
>>
>> Like Nils wrote, is this the right URL?
>
> It's a right URL, I think.  I converted recipe from Parabola, which
> references the same URL [1].  Maybe I should use a Parabola repository
> URL <https://repo.parabola.nu/other/cdrkit-libre/>?

http://cdrkit.org is currently empty.  Either way is fine with me.

>>> +    (synopsis "Portable command-line CD/DVD recorder software, mostly
>>> +compatible with cdrtools")
>>
>> “Command-line CD/DVD recorder” is enough IMO.
>
> OK.
>
>>> +    (description "Cdrkit is a suite of programs for recording CDs and DVDs,
>>> +blanking CD-RW media, creating ISO-9660 filesystem images, extracting audio CD
>>> +data, and more.")
>>
>> Here you can mention that it’s “mostly compatible …”.
>
> Do you mean “creating more compatible ISO-9660 …”?

I meant “mostly compatible with cdrtools”, which is what you had in
‘synopsis’ initially.

Looks like you’re now ready to go.

Thank you!

Ludo’.

bug#32165: [PATCH] gnu: Add cdrkit-libre.

[Oleg Pykhalov]

[-- Attachment #1: Type: text/plain, Size: 126 bytes --]

Hello Ludovic and Nils,

I applied all your suggestions and pushed as
c54511fde0b74bb53c144a84641e3b78ee629dd2

Thanks,
Oleg.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]