mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
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
8 changed files with 4 additions and 14 deletions
|
@ -95,7 +95,6 @@ (define* (autoconf-wrapper #:optional (autoconf autoconf))
|
|||
only be used internally---users should not end up distributing `configure'
|
||||
files with a system-specific shebang."
|
||||
(package (inherit autoconf)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name (string-append (package-name autoconf) "-wrapper"))
|
||||
(build-system trivial-build-system)
|
||||
(inputs `(("guile"
|
||||
|
|
|
@ -65,7 +65,6 @@ (define gnu-make-boot0
|
|||
(package-with-bootstrap-guile
|
||||
(package (inherit gnu-make)
|
||||
(name "make-boot0")
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(arguments
|
||||
`(#:guile ,%bootstrap-guile
|
||||
#:implicit-inputs? #f
|
||||
|
@ -93,7 +92,6 @@ (define diffutils-boot0
|
|||
,@%bootstrap-inputs)
|
||||
#:guile %bootstrap-guile)))
|
||||
(package (inherit p)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(arguments `(#:tests? #f ; the test suite needs diffutils
|
||||
,@(package-arguments p)))))))
|
||||
|
||||
|
@ -531,7 +529,6 @@ (define-public gcc-final
|
|||
;; The final GCC.
|
||||
(package (inherit gcc-boot0)
|
||||
(name "gcc")
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(arguments
|
||||
`(#:guile ,%bootstrap-guile
|
||||
#:implicit-inputs? #f
|
||||
|
|
|
@ -38,7 +38,6 @@ (define-module (gnu packages cross-base)
|
|||
|
||||
(define (cross p target)
|
||||
(package (inherit p)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name (string-append (package-name p) "-cross-" target))
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments p)
|
||||
|
|
|
@ -123,7 +123,6 @@ (define-public emacs-no-x
|
|||
;; This is the version that you should use as an input to packages that just
|
||||
;; need to byte-compile .el files.
|
||||
(package (inherit emacs)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name "emacs-no-x")
|
||||
(synopsis "The extensible, customizable, self-documenting text
|
||||
editor (console only)")
|
||||
|
@ -138,7 +137,6 @@ (define-public emacs-no-x
|
|||
|
||||
(define-public emacs-no-x-toolkit
|
||||
(package (inherit emacs)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name "emacs-no-x-toolkit")
|
||||
(synopsis "The extensible, customizable, self-documenting text
|
||||
editor (without an X toolkit)" )
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; 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.
|
||||
;;;
|
||||
|
@ -605,7 +605,6 @@ (define %guile-static-stripped
|
|||
(define (tarball-package pkg)
|
||||
"Return a package containing a tarball of PKG."
|
||||
(package (inherit pkg)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name (string-append (package-name pkg) "-tarball"))
|
||||
(build-system trivial-build-system)
|
||||
(native-inputs `(("tar" ,tar)
|
||||
|
|
|
@ -560,7 +560,6 @@ (define-public petsc
|
|||
|
||||
(define-public petsc-complex
|
||||
(package (inherit petsc)
|
||||
(location (source-properties->location (current-source-location)))
|
||||
(name "petsc-complex")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments petsc)
|
||||
|
|
|
@ -160,12 +160,10 @@ (define (static-libgcc-package p)
|
|||
"A version of P linked with `-static-gcc'."
|
||||
(package-with-extra-configure-variable p "LDFLAGS" "-static-libgcc"))
|
||||
|
||||
(define* (static-package p #:optional (loc (current-source-location))
|
||||
#:key (strip-all? #t))
|
||||
(define* (static-package p #:key (strip-all? #t))
|
||||
"Return a statically-linked version of package P. If STRIP-ALL? is true,
|
||||
use `--strip-all' as the arguments to `strip'."
|
||||
(package (inherit p)
|
||||
(location (source-properties->location loc))
|
||||
(arguments
|
||||
(let ((a (default-keyword-arguments (package-arguments p)
|
||||
'(#:configure-flags '()
|
||||
|
|
|
@ -240,7 +240,8 @@ (define-record-type* <package>
|
|||
|
||||
(location package-location
|
||||
(default (and=> (current-source-location)
|
||||
source-properties->location))))
|
||||
source-properties->location))
|
||||
(innate)))
|
||||
|
||||
(set-record-type-printer! <package>
|
||||
(lambda (package port)
|
||||
|
|
Loading…
Reference in a new issue