ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages: Mark 'replacement' as an "innate" field.

Browse source 
Suggested by Mark H Weaver
at <https://lists.gnu.org/archive/html/guix-devel/2017-06/msg00355.html>.

* guix/packages.scm (<package>)[replacement]: Mark as "innate".
* gnu/packages/base.scm (glibc-2.25-patched, glibc-2.24)
(glibc-2.23, glibc-2.22, glibc-2.21, glibc-locales): Remove
'replacement' field, which was set to #f.
* gnu/packages/commencement.scm (perl-boot0): Likewise.
* gnu/packages/fontutils.scm (graphite2/fixed): Likewise.
* gnu/packages/ghostscript.scm (ghostscript/fixed): Likewise.
* gnu/packages/gnupg.scm (libgcrypt-1.7.8): Likewise.
* gnu/packages/guile.scm (guile-2.0/fixed, guile-2.2): Likewise.
* gnu/packages/icu4c.scm (icu4c/fixed): Likewise.
* gnu/packages/image.scm (libpng-apng): Likewise.
* gnu/packages/make-bootstrap.scm (%guile-static): Likewise.
* gnu/packages/pcre.scm (pcre/fixed): Likewise.
* gnu/packages/perl.scm (perl/fixed): Likewise.
* gnu/packages/ruby.scm (ruby-2.3, ruby-2.2, ruby-2.1)
(ruby-1.8): Likewise.
* gnu/packages/tls.scm (gnutls-3.5.13, gnutls/guile-2.2): Likewise.
* gnu/packages/xml.scm (expat-2.2.1): Likewise.
This commit is contained in:
Ludovic Courtès 2017-07-03 12:07:23 +02:00
parent f6444059dd
commit d5ec5ed719
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
15 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/base.scm
View file

@ -905,7 +905,6 @@ (define-syntax glibc
(define glibc-2.25-patched
(package
(inherit glibc)
(replacement #f)
(source (origin
(inherit (package-source glibc))
(patches (search-patches "glibc-ldd-x86_64.patch"
@ -923,7 +922,6 @@ (define-public glibc-2.24
(package
(inherit glibc)
(version "2.24")
(replacement #f)
(source (origin
(inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-"
@ -943,7 +941,6 @@ (define-public glibc-2.23
(package
(inherit glibc)
(version "2.23")
(replacement #f)
(source (origin
(inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-"
@ -963,7 +960,6 @@ (define-public glibc-2.22
(package
(inherit glibc)
(version "2.22")
(replacement #f)
(source (origin
(inherit (package-source glibc))
(uri (string-append "mirror://gnu/glibc/glibc-"
@ -991,7 +987,6 @@ (define-public glibc-2.21
(package
(inherit glibc-2.22)
(version "2.21")
(replacement #f)
(source (origin
(inherit (package-source glibc-2.22))
(uri (string-append "mirror://gnu/glibc/glibc-"
@ -1004,7 +999,6 @@ (define-public glibc-locales
(package
(inherit glibc)
(name "glibc-locales")
(replacement #f)
(source (origin (inherit (package-source glibc))
(patches (cons (search-patch "glibc-locales.patch")
(origin-patches (package-source glibc))))))

1
gnu/packages/commencement.scm
View file

@ -294,7 +294,6 @@ (define perl-boot0
(let ((perl (package
(inherit perl)
(name "perl-boot0")
(replacement #f)
(arguments
;; At the very least, this must not depend on GCC & co.
(let ((args `(#:disallowed-references

1
gnu/packages/fontutils.scm
View file

@ -415,7 +415,6 @@ (define graphite2/fixed
(package
(inherit graphite2)
(name "graphite2")
(replacement #f)
(source
(origin
(method url-fetch)

1
gnu/packages/ghostscript.scm
View file

@ -219,7 +219,6 @@ (define-public ghostscript/x
(define ghostscript/fixed
(package
(inherit ghostscript)
(replacement #f)
(source
(origin
(inherit (package-source ghostscript))

2
gnu/packages/gnupg.scm
View file

@ -119,7 +119,6 @@ (define-public libgcrypt
(define libgcrypt-1.7.8
(package
(inherit libgcrypt)
(replacement #f)
(version "1.7.8")
(source (origin
(method url-fetch)
@ -131,7 +130,6 @@ (define libgcrypt-1.7.8
(define-public libgcrypt-1.5
(package (inherit libgcrypt)
(replacement #f)
(version "1.5.6")
(source
(origin

4
gnu/packages/guile.scm
View file

@ -217,14 +217,12 @@ (define-public guile-2.0/fixed
;; in the `base' module, and thus changing it entails a full rebuild.
(package
(inherit guile-2.0)
(properties '((hidden? . #t))) ;people should install 'guile-2.0'
(replacement #f)))
(properties '((hidden? . #t))))) ;people should install 'guile-2.0'
(define-public guile-2.2
(package (inherit guile-2.0)
(name "guile")
(version "2.2.2")
(replacement #f)
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/guile/guile-" version

1
gnu/packages/icu4c.scm
View file

@ -71,7 +71,6 @@ (define-public icu4c
(define icu4c/fixed
(package
(inherit icu4c)
(replacement #f)
(source (origin
(inherit (package-source icu4c))
(patches

1
gnu/packages/image.scm
View file

@ -94,7 +94,6 @@ (define-public libpng
(define-public libpng-apng
(package
(inherit libpng)
(replacement #f) ;libpng's replacement doesn't apply here
(name "libpng-apng")
(version (package-version libpng))
(arguments

1
gnu/packages/make-bootstrap.scm
View file

@ -509,7 +509,6 @@ (define %guile-static
(patches patches)))
(guile (package (inherit guile-2.0)
(name (string-append (package-name guile-2.0) "-static"))
(replacement #f)
(source source)
(synopsis "Statically-linked and relocatable Guile")

1
gnu/packages/pcre.scm
View file

@ -75,7 +75,6 @@ (define-public pcre
(define pcre/fixed
(package
(inherit pcre)
(replacement #f)
(source (origin
(inherit (package-source pcre))
(patches (search-patches "pcre-CVE-2017-7186.patch"))))))

1
gnu/packages/perl.scm
View file

@ -151,7 +151,6 @@ (define-public perl
(define perl/fixed
(package
(inherit perl)
(replacement #f)
(source
(origin
(inherit (package-source perl))

4
gnu/packages/ruby.scm
View file

@ -106,7 +106,6 @@ (define-public ruby-2.3
(package
(inherit ruby)
(version "2.3.4")
(replacement #f)
(source
(origin
(method url-fetch)
@ -124,7 +123,6 @@ (define-public ruby-2.3
(define-public ruby-2.2
(package (inherit ruby)
(replacement #f)
(version "2.2.7")
(source
(origin
@ -138,7 +136,6 @@ (define-public ruby-2.2
(define-public ruby-2.1
(package (inherit ruby)
(replacement #f)
(version "2.1.10")
(source
(origin
@ -172,7 +169,6 @@ (define-public ruby-2.1
(define-public ruby-1.8
(package (inherit ruby)
(replacement #f)
(version "1.8.7-p374")
(source
(origin

2
gnu/packages/tls.scm
View file

@ -222,7 +222,6 @@ (define gnutls-3.5.13 ;GNUTLS-SA-2017-{3,4}
;; We use 'D' instead of '13' here to keep the store file name at
;; the same length. See <https://bugs.gnu.org/27308>.
(version "3.5.D")
(replacement #f)
(source (origin
(method url-fetch)
(uri
@ -240,7 +239,6 @@ (define-public gnutls/guile-2.2
;; GnuTLS for Guile 2.2. This is supported by GnuTLS >= 3.5.5.
(package
(inherit gnutls)
(replacement #f)
(source (package-source gnutls-3.5.13))
(name "guile2.2-gnutls")
(arguments

1
gnu/packages/xml.scm
View file

@ -79,7 +79,6 @@ (define expat-2.2.1 ; Fixes CVE-2017-9233, CVE-2016-9063 and other issues.
(package
(inherit expat)
(version "2.2.1")
(replacement #f)
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/expat/expat/"

5
guix/packages.scm
View file

@ -269,8 +269,11 @@ (define-record-type* <package>
; inputs
(native-search-paths package-native-search-paths (default '()))
(search-paths package-search-paths (default '()))
;; The 'replacement' field is marked as "innate" because it never makes
;; sense to inherit a replacement as is. See the 'package/inherit' macro.
(replacement package-replacement ; package | #f
(default #f) (thunked))
(default #f) (thunked) (innate))
(synopsis package-synopsis) ; one-line description
(description package-description) ; one or two paragraphs