nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-system: Remove irrelevant special case. 

* guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Remove comment
  about case where GUILE is a derivation path.
* guix/build-system/cmake.scm (cmake-build): Remove case where GUILE is
  a derivation path.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/trivial.scm (guile-for-build): Likewise.
This commit is contained in:
Ludovic Courtès 2014-10-01 22:11:45 +02:00
parent 5e1103821a
commit 2348fd0f51
6 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/build-system/cmake.scm
View File

@ -98,8 +98,6 @@ provides a 'CMakeLists.txt' file as its build system."
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))

4
guix/build-system/gnu.scm
View File

@ -344,8 +344,6 @@ are allowed to refer to."
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
;; ((and (? string?) (? derivation-path?))
;; guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))
@ -530,8 +528,6 @@ platform."
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
;; ((and (? string?) (? derivation-path?))
;; guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))

2
guix/build-system/perl.scm
View File

@ -90,8 +90,6 @@ provides a `Makefile.PL' file as its build system."
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))

2
guix/build-system/python.scm
View File

@ -138,8 +138,6 @@ provides a 'setup.py' file as its build system."
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))

2
guix/build-system/ruby.scm
View File

@ -77,8 +77,6 @@
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f (#f
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))

2
guix/build-system/trivial.scm
View File

@ -29,8 +29,6 @@
(match guile (match guile
((? package?) ((? package?)
(package-derivation store guile system)) (package-derivation store guile system))
((and (? string?) (? derivation-path?))
guile)
(#f ; the default (#f ; the default
(let* ((distro (resolve-interface '(gnu packages commencement))) (let* ((distro (resolve-interface '(gnu packages commencement)))
(guile (module-ref distro 'guile-final))) (guile (module-ref distro 'guile-final)))