diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-28 15:34:03 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-28 19:08:54 +0200 |
| commit | ccd7daae4cc83fd8a012261641e0127c7330e49b (patch) | |
| tree | 1ea8c4f9f34a1f4577475653c3e46a5c7d86daa3 | |
| parent | 6a09628cb1147481131e582c1711edeb0db81944 (diff) | |
| download | guix-ccd7daae4cc83fd8a012261641e0127c7330e49b.tar guix-ccd7daae4cc83fd8a012261641e0127c7330e49b.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/base.scm | 23 | ||||
| -rw-r--r-- | gnu/system.scm | 2 |
2 files changed, 1 insertions, 24 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 28e0325534..0ad6624dd5 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -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 diff --git a/gnu/system.scm b/gnu/system.scm index 0076f2fcb1..8e44ee85b3 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -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 |