packages: Make 'location' field innate.
* guix/packages.scm (<package>)[location]: Add 'innate' property. * guix/build-system/gnu.scm (static-package): Remove 'loc' parameter and 'location' field. * gnu/packages/autotools.scm (autoconf-wrapper): Remove 'location' field. * gnu/packages/commencement.scm (gnu-make-boot0, diffutils-boot0, gcc-final): Likewise. * gnu/packages/cross-base.scm (cross): Likewise. * gnu/packages/emacs.scm (emacs-no-x, emacs-no-x-toolkit): Likewise. * gnu/packages/make-bootstrap.scm (tarball-package): Likewise. * gnu/packages/maths.scm (petsc-complex): Likewise.
This commit is contained in:
parent
8a16d064fa
commit
0004c5904c
|
@ -95,7 +95,6 @@ use our own Bash instead of /bin/sh in shebangs. For that reason, it should
|
||||||
only be used internally---users should not end up distributing `configure'
|
only be used internally---users should not end up distributing `configure'
|
||||||
files with a system-specific shebang."
|
files with a system-specific shebang."
|
||||||
(package (inherit autoconf)
|
(package (inherit autoconf)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name (string-append (package-name autoconf) "-wrapper"))
|
(name (string-append (package-name autoconf) "-wrapper"))
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(inputs `(("guile"
|
(inputs `(("guile"
|
||||||
|
|
|
@ -65,7 +65,6 @@
|
||||||
(package-with-bootstrap-guile
|
(package-with-bootstrap-guile
|
||||||
(package (inherit gnu-make)
|
(package (inherit gnu-make)
|
||||||
(name "make-boot0")
|
(name "make-boot0")
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(arguments
|
(arguments
|
||||||
`(#:guile ,%bootstrap-guile
|
`(#:guile ,%bootstrap-guile
|
||||||
#:implicit-inputs? #f
|
#:implicit-inputs? #f
|
||||||
|
@ -93,7 +92,6 @@
|
||||||
,@%bootstrap-inputs)
|
,@%bootstrap-inputs)
|
||||||
#:guile %bootstrap-guile)))
|
#:guile %bootstrap-guile)))
|
||||||
(package (inherit p)
|
(package (inherit p)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(arguments `(#:tests? #f ; the test suite needs diffutils
|
(arguments `(#:tests? #f ; the test suite needs diffutils
|
||||||
,@(package-arguments p)))))))
|
,@(package-arguments p)))))))
|
||||||
|
|
||||||
|
@ -531,7 +529,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
|
||||||
;; The final GCC.
|
;; The final GCC.
|
||||||
(package (inherit gcc-boot0)
|
(package (inherit gcc-boot0)
|
||||||
(name "gcc")
|
(name "gcc")
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(arguments
|
(arguments
|
||||||
`(#:guile ,%bootstrap-guile
|
`(#:guile ,%bootstrap-guile
|
||||||
#:implicit-inputs? #f
|
#:implicit-inputs? #f
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
|
|
||||||
(define (cross p target)
|
(define (cross p target)
|
||||||
(package (inherit p)
|
(package (inherit p)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name (string-append (package-name p) "-cross-" target))
|
(name (string-append (package-name p) "-cross-" target))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments p)
|
(substitute-keyword-arguments (package-arguments p)
|
||||||
|
|
|
@ -123,7 +123,6 @@ languages.")
|
||||||
;; This is the version that you should use as an input to packages that just
|
;; This is the version that you should use as an input to packages that just
|
||||||
;; need to byte-compile .el files.
|
;; need to byte-compile .el files.
|
||||||
(package (inherit emacs)
|
(package (inherit emacs)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name "emacs-no-x")
|
(name "emacs-no-x")
|
||||||
(synopsis "The extensible, customizable, self-documenting text
|
(synopsis "The extensible, customizable, self-documenting text
|
||||||
editor (console only)")
|
editor (console only)")
|
||||||
|
@ -138,7 +137,6 @@ editor (console only)")
|
||||||
|
|
||||||
(define-public emacs-no-x-toolkit
|
(define-public emacs-no-x-toolkit
|
||||||
(package (inherit emacs)
|
(package (inherit emacs)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name "emacs-no-x-toolkit")
|
(name "emacs-no-x-toolkit")
|
||||||
(synopsis "The extensible, customizable, self-documenting text
|
(synopsis "The extensible, customizable, self-documenting text
|
||||||
editor (without an X toolkit)" )
|
editor (without an X toolkit)" )
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -605,7 +605,6 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
(define (tarball-package pkg)
|
(define (tarball-package pkg)
|
||||||
"Return a package containing a tarball of PKG."
|
"Return a package containing a tarball of PKG."
|
||||||
(package (inherit pkg)
|
(package (inherit pkg)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name (string-append (package-name pkg) "-tarball"))
|
(name (string-append (package-name pkg) "-tarball"))
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(native-inputs `(("tar" ,tar)
|
(native-inputs `(("tar" ,tar)
|
||||||
|
|
|
@ -560,7 +560,6 @@ scientific applications modeled by partial differential equations.")
|
||||||
|
|
||||||
(define-public petsc-complex
|
(define-public petsc-complex
|
||||||
(package (inherit petsc)
|
(package (inherit petsc)
|
||||||
(location (source-properties->location (current-source-location)))
|
|
||||||
(name "petsc-complex")
|
(name "petsc-complex")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments petsc)
|
(substitute-keyword-arguments (package-arguments petsc)
|
||||||
|
|
|
@ -160,12 +160,10 @@ flags for VARIABLE, the associated value is augmented."
|
||||||
"A version of P linked with `-static-gcc'."
|
"A version of P linked with `-static-gcc'."
|
||||||
(package-with-extra-configure-variable p "LDFLAGS" "-static-libgcc"))
|
(package-with-extra-configure-variable p "LDFLAGS" "-static-libgcc"))
|
||||||
|
|
||||||
(define* (static-package p #:optional (loc (current-source-location))
|
(define* (static-package p #:key (strip-all? #t))
|
||||||
#:key (strip-all? #t))
|
|
||||||
"Return a statically-linked version of package P. If STRIP-ALL? is true,
|
"Return a statically-linked version of package P. If STRIP-ALL? is true,
|
||||||
use `--strip-all' as the arguments to `strip'."
|
use `--strip-all' as the arguments to `strip'."
|
||||||
(package (inherit p)
|
(package (inherit p)
|
||||||
(location (source-properties->location loc))
|
|
||||||
(arguments
|
(arguments
|
||||||
(let ((a (default-keyword-arguments (package-arguments p)
|
(let ((a (default-keyword-arguments (package-arguments p)
|
||||||
'(#:configure-flags '()
|
'(#:configure-flags '()
|
||||||
|
|
|
@ -240,7 +240,8 @@ representation."
|
||||||
|
|
||||||
(location package-location
|
(location package-location
|
||||||
(default (and=> (current-source-location)
|
(default (and=> (current-source-location)
|
||||||
source-properties->location))))
|
source-properties->location))
|
||||||
|
(innate)))
|
||||||
|
|
||||||
(set-record-type-printer! <package>
|
(set-record-type-printer! <package>
|
||||||
(lambda (package port)
|
(lambda (package port)
|
||||||
|
|
Loading…
Reference in New Issue