From 2348fd0f51b6eeabde2e384ef495b3a0adbd6bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 1 Oct 2014 22:11:45 +0200 Subject: [PATCH] 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. --- guix/build-system/cmake.scm | 2 -- guix/build-system/gnu.scm | 4 ---- guix/build-system/perl.scm | 2 -- guix/build-system/python.scm | 2 -- guix/build-system/ruby.scm | 2 -- guix/build-system/trivial.scm | 2 -- 6 files changed, 14 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 5673ad5aeb..5e7fba0ac3 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -98,8 +98,6 @@ provides a 'CMakeLists.txt' file as its build system." (match guile ((? package?) (package-derivation store guile system)) - ((and (? string?) (? derivation-path?)) - guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 7c9b6ca398..372ad14b71 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -344,8 +344,6 @@ are allowed to refer to." (match guile ((? package?) (package-derivation store guile system)) - ;; ((and (? string?) (? derivation-path?)) - ;; guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) @@ -530,8 +528,6 @@ platform." (match guile ((? package?) (package-derivation store guile system)) - ;; ((and (? string?) (? derivation-path?)) - ;; guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 993cd7448e..600e597ce8 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -90,8 +90,6 @@ provides a `Makefile.PL' file as its build system." (match guile ((? package?) (package-derivation store guile system)) - ((and (? string?) (? derivation-path?)) - guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index dfb8b4a137..a90e7ff511 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -138,8 +138,6 @@ provides a 'setup.py' file as its build system." (match guile ((? package?) (package-derivation store guile system)) - ((and (? string?) (? derivation-path?)) - guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index f20967a619..426ca3718c 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -77,8 +77,6 @@ (match guile ((? package?) (package-derivation store guile system)) - ((and (? string?) (? derivation-path?)) - guile) (#f (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final))) diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm index 475e8563e5..897c5c6152 100644 --- a/guix/build-system/trivial.scm +++ b/guix/build-system/trivial.scm @@ -29,8 +29,6 @@ (match guile ((? package?) (package-derivation store guile system)) - ((and (? string?) (? derivation-path?)) - guile) (#f ; the default (let* ((distro (resolve-interface '(gnu packages commencement))) (guile (module-ref distro 'guile-final)))