From 528ea990c3a815cb4b0ded913ea22cdc778839bd Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 30 Mar 2019 14:34:40 +0100
Subject: gnu: Use 'this-package' as a native input instead of
 'self-native-input?'.

* gnu/packages/file.scm (file)[self-native-input?]: Remove.
[native-inputs]: New field.
* gnu/packages/guile.scm (guile-1.8)[self-native-input?]: Remove.
[native-inputs]: New field.
(guile-2.0)[self-native-input?]: Remove.
[native-inputs]: Add THIS-PACKAGE when (%current-target-system) is true.
* gnu/packages/ncurses.scm (ncurses)[self-native-input?]: Remove.
[native-inputs]: Add THIS-PACKAGE when (%current-target-system) is true.
* gnu/packages/python-xyz.scm (python-file)[self-native-input?]: Remove.
[native-inputs]: New field.
---
 gnu/packages/guile.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index daeadca610..5903bcabaa 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -103,6 +103,12 @@
                       (substitute* "ice-9/popen.scm"
                         (("/bin/sh") (which "sh")))
                       #t)))))
+
+   ;; When cross-compiling, a native version of Guile itself is needed.
+   (native-inputs (if (%current-target-system)
+                      `(("self" ,this-package))
+                      '()))
+
    (inputs `(("gawk" ,gawk)
              ("readline" ,readline)))
 
@@ -111,9 +117,6 @@
    (propagated-inputs `(("gmp" ,gmp)
                         ("libltdl" ,libltdl)))
 
-   ;; When cross-compiling, a native version of Guile itself is needed.
-   (self-native-input? #t)
-
    (native-search-paths
     (list (search-path-specification
            (variable "GUILE_LOAD_PATH")
@@ -141,7 +144,12 @@ without requiring the source code to be rewritten.")
              (base32
               "10lxc6l5alf3lzbs3ihnbfy6dfcrsyf8667wa57f26vf4mk2ai78"))))
    (build-system gnu-build-system)
-   (native-inputs `(("pkgconfig" ,pkg-config)))
+
+   ;; When cross-compiling, a native version of Guile itself is needed.
+   (native-inputs `(,@(if (%current-target-system)
+                          `(("self" ,this-package))
+                          '())
+                    ("pkgconfig" ,pkg-config)))
    (inputs `(("libffi" ,libffi)
              ,@(libiconv-if-needed)
 
@@ -165,8 +173,6 @@ without requiring the source code to be rewritten.")
       ("bdw-gc" ,libgc)
       ("gmp" ,gmp)))
 
-   (self-native-input? #t)
-
    (outputs '("out" "debug"))
 
    (arguments
-- 
cgit 1.4.1


From 329c3c323e32f3f97c452ee4455934fe57a18ff0 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sat, 30 Mar 2019 14:37:11 +0100
Subject: gnu: guile: Remove version 2.0.13.

This package was unused since 0991fd53367907908fbd901a9fbe79540e4e4527.

* gnu/packages/guile.scm (guile-2.0.13): Remove.
---
 gnu/packages/guile.scm | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 5903bcabaa..d4dd10ba11 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -213,20 +213,6 @@ without requiring the source code to be rewritten.")
    (home-page "https://www.gnu.org/software/guile/")
    (license license:lgpl3+)))
 
-(define-public guile-2.0.13
-  ;; For testing a "minimal" Guix
-  (hidden-package
-   (package (inherit guile-2.0)
-     (name "guile")
-     (version "2.0.13")
-     (source (origin
-               (method url-fetch)
-               (uri (string-append "mirror://gnu/guile/guile-" version
-                                   ".tar.xz"))
-               (sha256
-                (base32
-                 "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p")))))))
-
 (define-public guile-2.2
   (package (inherit guile-2.0)
     (name "guile")
-- 
cgit 1.4.1