* [PATCHES] Upgrade Kodi to 16.0
@ 2016-03-12 17:27 David Thompson
2016-03-12 20:10 ` Mathieu Lirzin
0 siblings, 1 reply; 7+ messages in thread
From: David Thompson @ 2016-03-12 17:27 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 116 bytes --]
This patch set adds 2 new dependencies for Kodi, dcadec and crossguid,
and upgrades Kodi to 16.0.
TIA for review,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-crossguid.patch --]
[-- Type: text/x-patch, Size: 3208 bytes --]
From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sat, 12 Mar 2016 12:23:47 -0500
Subject: [PATCH 1/3] gnu: Add crossguid.
* gnu/packages/kodi.scm (crossguid): New variable.
---
gnu/packages/kodi.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 4a9cebd..fd56af6 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -21,6 +21,7 @@
#:use-module (guix utils)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
@@ -68,6 +69,55 @@
#:use-module (gnu packages yasm)
#:use-module (gnu packages zip))
+(define-public crossguid
+ (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
+ (package
+ (name "crossguid")
+ (version (string-append "0.0-1." (string-take commit 7)))
+ ;; There's no official release. Just a Git repository.
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/graeme-hill/crossguid.git")
+ (commit commit)))
+ (sha256
+ (base32
+ "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (delete 'configure) ; no configure script
+ ;; There's no build system here, so we have to do it ourselves.
+ (replace 'build
+ (lambda _
+ (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
+ "-std=c++11" "-DGUID_LIBUUID"))
+ (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
+ (replace 'check
+ (lambda _
+ (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
+ "-std=c++11"))
+ (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
+ "-std=c++11"))
+ (zero? (system* "g++" "test.o" "guid.o" "testmain.o"
+ "-o" "test" "-luuid"))
+ (zero? (system* (string-append (getcwd) "/test"))))))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (install-file "guid.h" (string-append out "/include"))
+ (install-file "libcrossguid.a"
+ (string-append out "/lib"))
+ #t))))))
+ (inputs
+ `(("util-linux" ,util-linux)))
+ (synopsis "Lightweight GUID/UUID library")
+ (description "CrossGuid is a minimal GUID/UUID generator library for
+C++.")
+ (home-page "https://github.com/graeme-hill/crossguid")
+ (license license:expat))))
+
(define-public kodi
(package
(name "kodi")
--
2.6.3
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-dcadec.patch --]
[-- Type: text/x-patch, Size: 2028 bytes --]
From c7a1e349381a36080fb72a31f32665be157d22fe Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Tue, 1 Mar 2016 10:04:14 -0500
Subject: [PATCH 2/3] gnu: Add dcadec.
* gnu/packages/audio.scm (dcadec): New variable.
---
gnu/packages/audio.scm | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 10c2632..f489bc3 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2073,3 +2073,37 @@ module to handle that particular file type.")
(home-page "http://etree.org/shnutils/shntool/")
;; 'install-sh' bears the x11 license
(license (list license:gpl2+ license:x11))))
+
+(define-public dcadec
+ (package
+ (name "dcadec")
+ (version "0.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/foo86/dcadec/archive/v"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "0i0dpypgqkhhi4v1fmsp2way6w9kbcix3c7q79pmg39yvrzj17gd"))))
+ (build-system gnu-build-system)
+ (arguments
+ ;; Test files are missing: https://github.com/foo86/dcadec/issues/53
+ '(#:tests? #f
+ #:make-flags
+ (list "CC=gcc"
+ ;; Build shared library.
+ "CONFIG_SHARED=1"
+ (string-append "PREFIX=" (assoc-ref %outputs "out"))
+ ;; Set proper runpath.
+ (string-append "LDFLAGS=-Wl,-rpath="
+ (assoc-ref %outputs "out")
+ "/lib"))
+ #:phases
+ (modify-phases %standard-phases
+ ;; No configure script, just a hand-written Makefile.
+ (delete 'configure))))
+ (synopsis "DTS Coherent Acoustics decoder")
+ (description "Dcadec is a DTS Coherent Acoustics surround sound decoder
+with support for HD extensions.")
+ (home-page "https://github.com/foo86/dcadec")
+ (license license:lgpl2.1+)))
--
2.6.3
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-kodi-Update-to-16.0.patch --]
[-- Type: text/x-patch, Size: 1779 bytes --]
From 11f770f17e1965ce7316a4820a1ad652f1bdc0bf Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 29 Feb 2016 21:34:00 -0500
Subject: [PATCH 3/3] gnu: kodi: Update to 16.0.
* gnu/packages/kodi.scm (kodi): Update to 16.0.
---
gnu/packages/kodi.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index fd56af6..1cc1546 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -121,15 +121,15 @@ C++.")
(define-public kodi
(package
(name "kodi")
- (version "15.2")
+ (version "16.0")
(source (origin
(method url-fetch)
(uri (string-append "http://mirrors.kodi.tv/releases/source/"
- version "-Isengard.tar.gz"))
+ version "-Jarvis.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx"))
+ "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884"))
(snippet
;; Delete bundled ffmpeg.
;; TODO: Delete every other bundled library.
@@ -211,7 +211,9 @@ C++.")
("bluez" ,bluez)
("boost" ,boost)
("bzip2" ,bzip2)
+ ("crossguid" ,crossguid)
("curl" ,curl)
+ ("dcadec" ,dcadec)
("dbus" ,dbus)
("enca" ,enca)
("eudev" ,eudev)
@@ -263,6 +265,7 @@ C++.")
("taglib" ,taglib)
("tinyxml" ,tinyxml)
("unzip" ,unzip)
+ ("util-linux" ,util-linux)
("zip" ,zip)
("zlib" ,zlib)))
(synopsis "Media center for home theater computers")
--
2.6.3
[-- Attachment #5: Type: text/plain, Size: 8 bytes --]
- Dave
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-12 17:27 [PATCHES] Upgrade Kodi to 16.0 David Thompson
@ 2016-03-12 20:10 ` Mathieu Lirzin
2016-03-13 1:02 ` Thompson, David
0 siblings, 1 reply; 7+ messages in thread
From: Mathieu Lirzin @ 2016-03-12 20:10 UTC (permalink / raw)
To: David Thompson; +Cc: guix-devel
Hello David,
David Thompson <dthompson2@worcester.edu> writes:
>From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Sat, 12 Mar 2016 12:23:47 -0500
> Subject: [PATCH 1/3] gnu: Add crossguid.
>
> * gnu/packages/kodi.scm (crossguid): New variable.
> ---
[...]
> +(define-public crossguid
> + (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
> + (package
> + (name "crossguid")
> + (version (string-append "0.0-1." (string-take commit 7)))
> + ;; There's no official release. Just a Git repository.
> + (source (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/graeme-hill/crossguid.git")
> + (commit commit)))
> + (sha256
> + (base32
> + "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
You have omitted “(file-name (string-append name "-" version ".tar.gz"))”.
> + (build-system gnu-build-system)
Maybe ‘trivial-build-system’ would be more adapted. WDYT?
> + (arguments
> + '(#:phases
> + (modify-phases %standard-phases
> + (delete 'configure) ; no configure script
> + ;; There's no build system here, so we have to do it ourselves.
> + (replace 'build
> + (lambda _
> + (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
> + "-std=c++11" "-DGUID_LIBUUID"))
> + (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
> + (replace 'check
> + (lambda _
> + (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
> + "-std=c++11"))
> + (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
> + "-std=c++11"))
> + (zero? (system* "g++" "test.o" "guid.o" "testmain.o"
> + "-o" "test" "-luuid"))
> + (zero? (system* (string-append (getcwd) "/test"))))))
> + (replace 'install
> + (lambda* (#:key outputs #:allow-other-keys)
> + (let ((out (assoc-ref outputs "out")))
> + (install-file "guid.h" (string-append out "/include"))
> + (install-file "libcrossguid.a"
> + (string-append out "/lib"))
> + #t))))))
> + (inputs
> + `(("util-linux" ,util-linux)))
> + (synopsis "Lightweight GUID/UUID library")
What about using “Lightweight universal identifier library” to avoid
technical abbreviations?
> + (description "CrossGuid is a minimal GUID/UUID generator library for
> +C++.")
I think using “@acronym{}” for GUID and UUID would be appropriate.
Could you rephrase the description to describe their usual purpose?
>From c7a1e349381a36080fb72a31f32665be157d22fe Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Tue, 1 Mar 2016 10:04:14 -0500
> Subject: [PATCH 2/3] gnu: Add dcadec.
>
> * gnu/packages/audio.scm (dcadec): New variable.
> ---
[...]
> +
> +(define-public dcadec
> + (package
> + (name "dcadec")
> + (version "0.2.0")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "https://github.com/foo86/dcadec/archive/v"
> + version ".tar.gz"))
> + (sha256
> + (base32
> + "0i0dpypgqkhhi4v1fmsp2way6w9kbcix3c7q79pmg39yvrzj17gd"))))
Like previous patch “(file-name (string-append name "-" version ".tar.gz"))”.
>From 11f770f17e1965ce7316a4820a1ad652f1bdc0bf Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Mon, 29 Feb 2016 21:34:00 -0500
> Subject: [PATCH 3/3] gnu: kodi: Update to 16.0.
>
> * gnu/packages/kodi.scm (kodi): Update to 16.0.
“[inputs]: Add crossguid, dcadec, and util-linux.”
Otherwise LGTM!
Thanks.
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-12 20:10 ` Mathieu Lirzin
@ 2016-03-13 1:02 ` Thompson, David
2016-03-13 9:24 ` Ricardo Wurmus
0 siblings, 1 reply; 7+ messages in thread
From: Thompson, David @ 2016-03-13 1:02 UTC (permalink / raw)
To: Mathieu Lirzin; +Cc: guix-devel
Hello Mathieu,
On Sat, Mar 12, 2016 at 3:10 PM, Mathieu Lirzin <mthl@gnu.org> wrote:
> Hello David,
>
> David Thompson <dthompson2@worcester.edu> writes:
>
>>From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Sat, 12 Mar 2016 12:23:47 -0500
>> Subject: [PATCH 1/3] gnu: Add crossguid.
>>
>> * gnu/packages/kodi.scm (crossguid): New variable.
>> ---
> [...]
>> +(define-public crossguid
>> + (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
>> + (package
>> + (name "crossguid")
>> + (version (string-append "0.0-1." (string-take commit 7)))
>> + ;; There's no official release. Just a Git repository.
>> + (source (origin
>> + (method git-fetch)
>> + (uri (git-reference
>> + (url "https://github.com/graeme-hill/crossguid.git")
>> + (commit commit)))
>> + (sha256
>> + (base32
>> + "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
>
> You have omitted “(file-name (string-append name "-" version ".tar.gz"))”.
Not in this case because it's a git checkout, not a tarball download.
>> + (build-system gnu-build-system)
>
> Maybe ‘trivial-build-system’ would be more adapted. WDYT?
The GNU build system still does plenty of useful things like patching
shebangs, validating runpaths, and providing GCC. So, I'd like to
keep it.
>> + (arguments
>> + '(#:phases
>> + (modify-phases %standard-phases
>> + (delete 'configure) ; no configure script
>> + ;; There's no build system here, so we have to do it ourselves.
>> + (replace 'build
>> + (lambda _
>> + (and (zero? (system* "g++" "-c" "guid.cpp" "-o" "guid.o"
>> + "-std=c++11" "-DGUID_LIBUUID"))
>> + (zero? (system* "ar" "rvs" "libcrossguid.a" "guid.o")))))
>> + (replace 'check
>> + (lambda _
>> + (and (zero? (system* "g++" "-c" "test.cpp" "-o" "test.o"
>> + "-std=c++11"))
>> + (zero? (system* "g++" "-c" "testmain.cpp" "-o" "testmain.o"
>> + "-std=c++11"))
>> + (zero? (system* "g++" "test.o" "guid.o" "testmain.o"
>> + "-o" "test" "-luuid"))
>> + (zero? (system* (string-append (getcwd) "/test"))))))
>> + (replace 'install
>> + (lambda* (#:key outputs #:allow-other-keys)
>> + (let ((out (assoc-ref outputs "out")))
>> + (install-file "guid.h" (string-append out "/include"))
>> + (install-file "libcrossguid.a"
>> + (string-append out "/lib"))
>> + #t))))))
>> + (inputs
>> + `(("util-linux" ,util-linux)))
>> + (synopsis "Lightweight GUID/UUID library")
>
> What about using “Lightweight universal identifier library” to avoid
> technical abbreviations?
Sure.
>> + (description "CrossGuid is a minimal GUID/UUID generator library for
>> +C++.")
>
> I think using “@acronym{}” for GUID and UUID would be appropriate.
> Could you rephrase the description to describe their usual purpose?
I added the "@acronym{}" stuff, but I don't think the description
needs expanding.
>>From c7a1e349381a36080fb72a31f32665be157d22fe Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Tue, 1 Mar 2016 10:04:14 -0500
>> Subject: [PATCH 2/3] gnu: Add dcadec.
>>
>> * gnu/packages/audio.scm (dcadec): New variable.
>> ---
> [...]
>> +
>> +(define-public dcadec
>> + (package
>> + (name "dcadec")
>> + (version "0.2.0")
>> + (source (origin
>> + (method url-fetch)
>> + (uri (string-append "https://github.com/foo86/dcadec/archive/v"
>> + version ".tar.gz"))
>> + (sha256
>> + (base32
>> + "0i0dpypgqkhhi4v1fmsp2way6w9kbcix3c7q79pmg39yvrzj17gd"))))
>
> Like previous patch “(file-name (string-append name "-" version ".tar.gz"))”.
Oops, thanks for catching this! Fixed.
>>From 11f770f17e1965ce7316a4820a1ad652f1bdc0bf Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Mon, 29 Feb 2016 21:34:00 -0500
>> Subject: [PATCH 3/3] gnu: kodi: Update to 16.0.
>>
>> * gnu/packages/kodi.scm (kodi): Update to 16.0.
>
> “[inputs]: Add crossguid, dcadec, and util-linux.”
Done.
If no one has any other comments then I will push soon.
Thanks!
- Dave
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-13 1:02 ` Thompson, David
@ 2016-03-13 9:24 ` Ricardo Wurmus
2016-03-14 19:14 ` Thompson, David
0 siblings, 1 reply; 7+ messages in thread
From: Ricardo Wurmus @ 2016-03-13 9:24 UTC (permalink / raw)
To: Thompson, David; +Cc: guix-devel
Thompson, David <dthompson2@worcester.edu> writes:
> Hello Mathieu,
>
> On Sat, Mar 12, 2016 at 3:10 PM, Mathieu Lirzin <mthl@gnu.org> wrote:
>> Hello David,
>>
>> David Thompson <dthompson2@worcester.edu> writes:
>>
>>>From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
>>> From: David Thompson <dthompson2@worcester.edu>
>>> Date: Sat, 12 Mar 2016 12:23:47 -0500
>>> Subject: [PATCH 1/3] gnu: Add crossguid.
>>>
>>> * gnu/packages/kodi.scm (crossguid): New variable.
>>> ---
>> [...]
>>> +(define-public crossguid
>>> + (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
>>> + (package
>>> + (name "crossguid")
>>> + (version (string-append "0.0-1." (string-take commit 7)))
>>> + ;; There's no official release. Just a Git repository.
>>> + (source (origin
>>> + (method git-fetch)
>>> + (uri (git-reference
>>> + (url "https://github.com/graeme-hill/crossguid.git")
>>> + (commit commit)))
>>> + (sha256
>>> + (base32
>>> + "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
>>
>> You have omitted “(file-name (string-append name "-" version ".tar.gz"))”.
>
> Not in this case because it's a git checkout, not a tarball download.
Shouldn’t it be named “...-checkout” then? We do this a lot in the
bioinformatics.scm module.
~~ Ricardo
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-13 9:24 ` Ricardo Wurmus
@ 2016-03-14 19:14 ` Thompson, David
2016-03-14 21:53 ` Mathieu Lirzin
2016-03-15 16:17 ` Ludovic Courtès
0 siblings, 2 replies; 7+ messages in thread
From: Thompson, David @ 2016-03-14 19:14 UTC (permalink / raw)
To: Ricardo Wurmus; +Cc: guix-devel
On Sun, Mar 13, 2016 at 5:24 AM, Ricardo Wurmus <rekado@elephly.net> wrote:
>
> Thompson, David <dthompson2@worcester.edu> writes:
>
>> Hello Mathieu,
>>
>> On Sat, Mar 12, 2016 at 3:10 PM, Mathieu Lirzin <mthl@gnu.org> wrote:
>>> Hello David,
>>>
>>> David Thompson <dthompson2@worcester.edu> writes:
>>>
>>>>From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
>>>> From: David Thompson <dthompson2@worcester.edu>
>>>> Date: Sat, 12 Mar 2016 12:23:47 -0500
>>>> Subject: [PATCH 1/3] gnu: Add crossguid.
>>>>
>>>> * gnu/packages/kodi.scm (crossguid): New variable.
>>>> ---
>>> [...]
>>>> +(define-public crossguid
>>>> + (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
>>>> + (package
>>>> + (name "crossguid")
>>>> + (version (string-append "0.0-1." (string-take commit 7)))
>>>> + ;; There's no official release. Just a Git repository.
>>>> + (source (origin
>>>> + (method git-fetch)
>>>> + (uri (git-reference
>>>> + (url "https://github.com/graeme-hill/crossguid.git")
>>>> + (commit commit)))
>>>> + (sha256
>>>> + (base32
>>>> + "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
>>>
>>> You have omitted “(file-name (string-append name "-" version ".tar.gz"))”.
>>
>> Not in this case because it's a git checkout, not a tarball download.
>
> Shouldn’t it be named “...-checkout” then? We do this a lot in the
> bioinformatics.scm module.
It already gets a name like that without having to do anything.
I've pushed the patches. I can push an additional fix if it turns out
that something really ought to be changed with the directory name of
the git checkout.
- Dave
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-14 19:14 ` Thompson, David
@ 2016-03-14 21:53 ` Mathieu Lirzin
2016-03-15 16:17 ` Ludovic Courtès
1 sibling, 0 replies; 7+ messages in thread
From: Mathieu Lirzin @ 2016-03-14 21:53 UTC (permalink / raw)
To: Thompson, David; +Cc: guix-devel
"Thompson, David" <dthompson2@worcester.edu> writes:
> It already gets a name like that without having to do anything.
Maybe but ‘guix lint crossguid’ is currently not happy with it:
--8<---------------cut here---------------start------------->8---
gnu/packages/kodi.scm:78:14: crossguid-0.0-1.8f399e8: the source file name should contain the package name
--8<---------------cut here---------------end--------------->8---
--
Mathieu Lirzin
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHES] Upgrade Kodi to 16.0
2016-03-14 19:14 ` Thompson, David
2016-03-14 21:53 ` Mathieu Lirzin
@ 2016-03-15 16:17 ` Ludovic Courtès
1 sibling, 0 replies; 7+ messages in thread
From: Ludovic Courtès @ 2016-03-15 16:17 UTC (permalink / raw)
To: Thompson, David; +Cc: guix-devel
"Thompson, David" <dthompson2@worcester.edu> skribis:
> On Sun, Mar 13, 2016 at 5:24 AM, Ricardo Wurmus <rekado@elephly.net> wrote:
>>
>> Thompson, David <dthompson2@worcester.edu> writes:
>>
>>> Hello Mathieu,
>>>
>>> On Sat, Mar 12, 2016 at 3:10 PM, Mathieu Lirzin <mthl@gnu.org> wrote:
>>>> Hello David,
>>>>
>>>> David Thompson <dthompson2@worcester.edu> writes:
>>>>
>>>>>From 80f08dde121610dcc832f4e6ecdd11341166580c Mon Sep 17 00:00:00 2001
>>>>> From: David Thompson <dthompson2@worcester.edu>
>>>>> Date: Sat, 12 Mar 2016 12:23:47 -0500
>>>>> Subject: [PATCH 1/3] gnu: Add crossguid.
>>>>>
>>>>> * gnu/packages/kodi.scm (crossguid): New variable.
>>>>> ---
>>>> [...]
>>>>> +(define-public crossguid
>>>>> + (let ((commit "8f399e8bd4252be9952f3dfa8199924cc8487ca4"))
>>>>> + (package
>>>>> + (name "crossguid")
>>>>> + (version (string-append "0.0-1." (string-take commit 7)))
>>>>> + ;; There's no official release. Just a Git repository.
>>>>> + (source (origin
>>>>> + (method git-fetch)
>>>>> + (uri (git-reference
>>>>> + (url "https://github.com/graeme-hill/crossguid.git")
>>>>> + (commit commit)))
>>>>> + (sha256
>>>>> + (base32
>>>>> + "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
>>>>
>>>> You have omitted “(file-name (string-append name "-" version ".tar.gz"))”.
>>>
>>> Not in this case because it's a git checkout, not a tarball download.
>>
>> Shouldn’t it be named “...-checkout” then? We do this a lot in the
>> bioinformatics.scm module.
The default name is just ‘/gnu/store/…-git-checkout’, so you’d have to
write:
(file-name (string-append name "-" version "-checkout"))
See for instance ‘emacs-undo-tree’.
OK with this change.
Thank you!
Ludo’.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-03-15 16:17 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-12 17:27 [PATCHES] Upgrade Kodi to 16.0 David Thompson
2016-03-12 20:10 ` Mathieu Lirzin
2016-03-13 1:02 ` Thompson, David
2016-03-13 9:24 ` Ricardo Wurmus
2016-03-14 19:14 ` Thompson, David
2016-03-14 21:53 ` Mathieu Lirzin
2016-03-15 16:17 ` Ludovic Courtès
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).