~ruther/guix-local

ccd7daae4cc83fd8a012261641e0127c7330e49b — Marius Bakke 8 years ago 6a09628
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.
2 files changed, 1 insertions(+), 24 deletions(-)

M gnu/packages/base.scm
M gnu/system.scm
M gnu/packages/base.scm => gnu/packages/base.scm +0 -23
@@ 346,29 346,6 @@ functionality beyond that which is outlined in the POSIX standard.")
   (license gpl3+)
   (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
  ;; Coreutils without its optional dependencies.
  (package

M gnu/system.scm => gnu/system.scm +1 -1
@@ 502,7 502,7 @@ explicitly appear in OS."
         ;; The packages below are also in %FINAL-INPUTS, so take them from
         ;; there to avoid duplication.
         (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))))

(define %default-issue