diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
| commit | d726b954baaeff876ce9728e00920fa45f529f9a (patch) | |
| tree | 4b767b7586a1082dd2691bc33c3e45ace044e6e5 /gnu/packages/base.scm | |
| parent | 9a74a7db8626bc139307d115f5cec2648f5273ad (diff) | |
| parent | e165a2492d73d37c8b95d6970d453b9d88911ee6 (diff) | |
| download | guix-patches-d726b954baaeff876ce9728e00920fa45f529f9a.tar guix-patches-d726b954baaeff876ce9728e00920fa45f529f9a.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/ruby.scm
Diffstat (limited to 'gnu/packages/base.scm')
| -rw-r--r-- | gnu/packages/base.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e2c4408edd..10b7361b38 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -357,6 +357,7 @@ used to apply commands with arbitrarily long arguments.") (list (string-append "XFAIL_TESTS=tests/misc/env-S.pl" " tests/misc/kill.sh" " tests/misc/nice.sh" + " tests/misc/pwd-long.sh" " tests/split/fail.sh" " test-fdutimensat" " test-futimens" @@ -574,8 +575,8 @@ included.") ;; big refactoring of xtensa-modules.c (commit 567607c11fbf7105 upstream). ;; Keep this version around until the patch is updated. (define-public binutils-2.33 - (package/inherit - binutils + (package + (inherit binutils) (version "2.33.1") (source (origin (inherit (package-source binutils)) @@ -590,8 +591,7 @@ included.") (properties '()))) (define-public binutils-gold - (package - (inherit binutils) + (package/inherit binutils+documentation (name "binutils-gold") (arguments `(#:phases |