gnu: Remove workaround for <https://bugs.gnu.org/26238>.

* gnu/packages/base.scm (coreutils-8.27): Remove variable.
* gnu/system.scm (%base-packages): Change back to COREUTILS.
This commit is contained in:
Marius Bakke 2017-05-28 15:34:03 +01:00
parent 6a09628cb1
commit ccd7daae4c
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 1 additions and 24 deletions

View file

@ -346,29 +346,6 @@ (define-public coreutils
(license gpl3+) (license gpl3+)
(home-page "https://www.gnu.org/software/coreutils/"))) (home-page "https://www.gnu.org/software/coreutils/")))
;; We add version 8.27 here for use in (gnu system) due to a time
;; zone bug in `date' versions 8.25 - 8.26.
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=23035
;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26238
(define-public coreutils-8.27
(package
(inherit coreutils)
(version "8.27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/coreutils/coreutils-"
version ".tar.xz"))
(sha256
(base32
"0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8"))))
(arguments
(if (string-prefix? "arm" (or (%current-target-system)
(%current-system)))
(substitute-keyword-arguments (package-arguments coreutils)
((#:phases phases)
`(alist-delete 'patch-cut-test ,phases)))
(package-arguments coreutils)))))
(define-public coreutils-minimal (define-public coreutils-minimal
;; Coreutils without its optional dependencies. ;; Coreutils without its optional dependencies.
(package (package

View file

@ -502,7 +502,7 @@ (define %base-packages
;; The packages below are also in %FINAL-INPUTS, so take them from ;; The packages below are also in %FINAL-INPUTS, so take them from
;; there to avoid duplication. ;; there to avoid duplication.
(map canonical-package (map canonical-package
(list guile-2.2 bash coreutils-8.27 findutils grep sed (list guile-2.2 bash coreutils findutils grep sed
diffutils patch gawk tar gzip bzip2 xz lzip)))) diffutils patch gawk tar gzip bzip2 xz lzip))))
(define %default-issue (define %default-issue