* [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer
@ 2019-01-06 21:29 swedebugia
2019-01-06 21:43 ` swedebugia
2019-01-07 15:16 ` Eric Bavier
0 siblings, 2 replies; 3+ messages in thread
From: swedebugia @ 2019-01-06 21:29 UTC (permalink / raw)
To: 34000
[-- Attachment #1: Type: text/plain, Size: 24 bytes --]
--
Cheers
Swedebugia
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Separate-youtube-viewer-cli-from-youtube-viewer.patch --]
[-- Type: text/x-diff; name=0001-gnu-Separate-youtube-viewer-cli-from-youtube-viewer.patch, Size: 3634 bytes --]
From 354d66b2eba83f5e0ed1d7f55f6055d0be3f962e Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:10:20 +0100
Subject: [PATCH 1/2] gnu: Separate youtube-viewer-cli from youtube-viewer.
* gnu/packages/video.scm (youtube-viewer-cli): New variable.
---
gnu/packages/video.scm | 62 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dfcfc121a..c6bd9063c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1521,6 +1521,68 @@ Both command-line and GTK2 interface are available.")
(home-page "https://github.com/trizen/youtube-viewer")
(license license:perl-license)))
+(define-public youtube-viewer-cli
+ (package
+ (name "youtube-viewer-cli")
+ (version "3.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/trizen/youtube-viewer.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0axgb95lx81psgrb2a5rfdd8gl4mhsrzf41jas6l58d1xkaj54ri"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("perl-module-build" ,perl-module-build)))
+ ;; FIXME: Add optional dependencies once available:
+ ;; perl-lwp-useragent-cached
+ (inputs
+ `(("perl-data-dump" ,perl-data-dump)
+ ("perl-file-sharedir" ,perl-file-sharedir)
+ ("perl-json" ,perl-json)
+ ("perl-libwww" ,perl-libwww)
+ ("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
+ ;; The LWP::UserAgent::Cache module is recommended
+ ("perl-mozilla-ca" ,perl-mozilla-ca)
+ ;; ("perl-term-readline-gnu" ,perl-term-readline-gnu) not in guix yet
+ ("perl-unicode-linebreak" ,perl-unicode-linebreak)))
+ (arguments
+ `(#:modules ((guix build perl-build-system)
+ (guix build utils)
+ (srfi srfi-26))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/"))
+ (site-dir (string-append out "/lib/perl5/site_perl/"))
+ (lib-path (getenv "PERL5LIB")))
+ (for-each (cut wrap-program <>
+ `("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
+ (find-files bin-dir))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "youtube-viewer"
+ "youtube-viewer-cli")))))))
+ (synopsis
+ "CLI application for searching and streaming videos from YouTube")
+ (description
+ "Youtube-viewer-cli searches and plays YouTube videos from the command line.
+It comes with various search options; it can search for videos, playlists
+and/or channels. The videos are streamed directly in a selected video player
+at the best resolution (customizable) and with closed-captions (if available).
+GTK2 interface is available in @package{youtube-viewer-gtk}.")
+ (home-page "https://github.com/trizen/youtube-viewer")
+ (license license:perl-license)))
+
(define-public libbluray
(package
(name "libbluray")
--
2.19.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-youtube-viewer-Rename-to-youtube-viewer-gtk.patch --]
[-- Type: text/x-diff; name=0002-gnu-youtube-viewer-Rename-to-youtube-viewer-gtk.patch, Size: 1795 bytes --]
From cc52eb5b8010d2bd9d9387e8a763948ac95d0d0b Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:23:29 +0100
Subject: [PATCH 2/2] gnu: youtube-viewer: Rename to youtube-viewer-gtk
* gnu/packages/video.scm (youtube-viewer):
[name] Rename it.
[arguments] Add phase to rename the binary.
---
gnu/packages/video.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c6bd9063c..76ad48d19 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1466,9 +1466,9 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(home-page "https://you-get.org/")
(license license:expat)))
-(define-public youtube-viewer
+(define-public youtube-viewer-gtk
(package
- (name "youtube-viewer")
+ (name "youtube-viewer-gtk")
(version "3.5.0")
(source (origin
(method git-fetch)
@@ -1509,7 +1509,15 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(for-each (cut wrap-program <>
`("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
(find-files bin-dir))
- #t))))))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "gtk-youtube-viewer"
+ "youtube-viewer-gtk")
+ #t))))))))
(synopsis
"Lightweight application for searching and streaming videos from YouTube")
(description
--
2.19.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer
2019-01-06 21:29 [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer swedebugia
@ 2019-01-06 21:43 ` swedebugia
2019-01-07 15:16 ` Eric Bavier
1 sibling, 0 replies; 3+ messages in thread
From: swedebugia @ 2019-01-06 21:43 UTC (permalink / raw)
To: 34000; +Cc: Guix-patches
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
On 2019-01-06 21:29, swedebugia@riseup.net wrote:
>
This is updated to fix a parens error.
--
Cheers
Swedebugia
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Separate-youtube-viewer-cli-from-youtube-viewer.patch --]
[-- Type: text/x-diff; name=0001-gnu-Separate-youtube-viewer-cli-from-youtube-viewer.patch, Size: 3634 bytes --]
From 354d66b2eba83f5e0ed1d7f55f6055d0be3f962e Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:10:20 +0100
Subject: [PATCH 1/2] gnu: Separate youtube-viewer-cli from youtube-viewer.
* gnu/packages/video.scm (youtube-viewer-cli): New variable.
---
gnu/packages/video.scm | 62 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index dfcfc121a..c6bd9063c 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1521,6 +1521,68 @@ Both command-line and GTK2 interface are available.")
(home-page "https://github.com/trizen/youtube-viewer")
(license license:perl-license)))
+(define-public youtube-viewer-cli
+ (package
+ (name "youtube-viewer-cli")
+ (version "3.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/trizen/youtube-viewer.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0axgb95lx81psgrb2a5rfdd8gl4mhsrzf41jas6l58d1xkaj54ri"))))
+ (build-system perl-build-system)
+ (native-inputs
+ `(("perl-module-build" ,perl-module-build)))
+ ;; FIXME: Add optional dependencies once available:
+ ;; perl-lwp-useragent-cached
+ (inputs
+ `(("perl-data-dump" ,perl-data-dump)
+ ("perl-file-sharedir" ,perl-file-sharedir)
+ ("perl-json" ,perl-json)
+ ("perl-libwww" ,perl-libwww)
+ ("perl-lwp-protocol-https" ,perl-lwp-protocol-https)
+ ;; The LWP::UserAgent::Cache module is recommended
+ ("perl-mozilla-ca" ,perl-mozilla-ca)
+ ;; ("perl-term-readline-gnu" ,perl-term-readline-gnu) not in guix yet
+ ("perl-unicode-linebreak" ,perl-unicode-linebreak)))
+ (arguments
+ `(#:modules ((guix build perl-build-system)
+ (guix build utils)
+ (srfi srfi-26))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/"))
+ (site-dir (string-append out "/lib/perl5/site_perl/"))
+ (lib-path (getenv "PERL5LIB")))
+ (for-each (cut wrap-program <>
+ `("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
+ (find-files bin-dir))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "youtube-viewer"
+ "youtube-viewer-cli")))))))
+ (synopsis
+ "CLI application for searching and streaming videos from YouTube")
+ (description
+ "Youtube-viewer-cli searches and plays YouTube videos from the command line.
+It comes with various search options; it can search for videos, playlists
+and/or channels. The videos are streamed directly in a selected video player
+at the best resolution (customizable) and with closed-captions (if available).
+GTK2 interface is available in @package{youtube-viewer-gtk}.")
+ (home-page "https://github.com/trizen/youtube-viewer")
+ (license license:perl-license)))
+
(define-public libbluray
(package
(name "libbluray")
--
2.19.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-youtube-viewer-Rename-to-youtube-viewer-gtk.patch --]
[-- Type: text/x-diff; name=0002-gnu-youtube-viewer-Rename-to-youtube-viewer-gtk.patch, Size: 1748 bytes --]
From f9003e6c285e7b1c64ead7c6d876ba95d00dd1c2 Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Sun, 6 Jan 2019 22:23:29 +0100
Subject: [PATCH 2/2] gnu: youtube-viewer: Rename to youtube-viewer-gtk
* gnu/packages/video.scm (youtube-viewer):
[name] Rename it.
[arguments] Add phase to rename the binary.
---
gnu/packages/video.scm | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c6bd9063c..128152371 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1466,9 +1466,9 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(home-page "https://you-get.org/")
(license license:expat)))
-(define-public youtube-viewer
+(define-public youtube-viewer-gtk
(package
- (name "youtube-viewer")
+ (name "youtube-viewer-gtk")
(version "3.5.0")
(source (origin
(method git-fetch)
@@ -1509,6 +1509,14 @@ audio, images) from the Web. It can use either mpv or vlc for playback.")
(for-each (cut wrap-program <>
`("PERL5LIB" ":" prefix (,lib-path ,site-dir)))
(find-files bin-dir))
+ #t)))
+ (add-after 'wrap-program 'rename
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin-dir (string-append out "/bin/")))
+ (chdir bin-dir)
+ (rename-file "gtk-youtube-viewer"
+ "youtube-viewer-gtk")
#t))))))
(synopsis
"Lightweight application for searching and streaming videos from YouTube")
--
2.19.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer
2019-01-06 21:29 [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer swedebugia
2019-01-06 21:43 ` swedebugia
@ 2019-01-07 15:16 ` Eric Bavier
1 sibling, 0 replies; 3+ messages in thread
From: Eric Bavier @ 2019-01-07 15:16 UTC (permalink / raw)
To: swedebugia; +Cc: 34000
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
On Sun, 06 Jan 2019 13:29:19 -0800
swedebugia@riseup.net wrote:
> * gnu/packages/video.scm (youtube-viewer-cli): New variable.
> ---
> gnu/packages/video.scm | 62 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 62 insertions(+)
...
> Subject: [PATCH 2/2] gnu: youtube-viewer: Rename to youtube-viewer-gtk
>
> * gnu/packages/video.scm (youtube-viewer):
> [name] Rename it.
> [arguments] Add phase to rename the binary.
I think renaming binaries is too much of a divergence from upstream.
This can only cause confusion to users coming to Guix from another
distro that use the upstream binary names, and is unlikely to be
adopted upstream:
https://github.com/trizen/youtube-viewer/issues/230
If the desire is to create a slimmer cli-only package, would creating
another output not work?
`~Eric
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-07 15:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-06 21:29 [bug#34000] [PATCH] gnu: Separate youtube-viewer-cli from youtube-viewer swedebugia
2019-01-06 21:43 ` swedebugia
2019-01-07 15:16 ` Eric Bavier
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).