diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-02 15:32:30 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-02 15:32:30 +0200 |
| commit | 746ac457cc2748152a3a39d4296972fa20f19741 (patch) | |
| tree | 978f3bdb71cfd062df8da9be7ae0218d214626e1 /gnu/packages | |
| parent | c457f109bec75bfbf4619f3e18bcd82c33a15c07 (diff) | |
| parent | 3a3e9f2bb586e79a7931163f0191df61591b8017 (diff) | |
| download | patches-746ac457cc2748152a3a39d4296972fa20f19741.tar patches-746ac457cc2748152a3a39d4296972fa20f19741.tar.gz | |
Merge branch 'version-1.0.0'
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/gnome.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/libusb.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d33af15a29..8e3b7a406a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4633,6 +4633,14 @@ classes for commonly used data structures.") (base32 "1qbcwq89g4r67k1dj4laqj441pj4195c8hzhxn8vc6mmg8adg6kx")))) (build-system meson-build-system) + (arguments + ;; On 32-bit platforms, the test fails with a rounding error: + ;; <https://bugzilla.gnome.org/show_bug.cgi?id=775249>. Just skip it for + ;; now. + (if (and (not (%current-target-system)) + (member (%current-system) '("i686-linux" "armhf-linux"))) + '(#:tests? #f) + '())) (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 61329d27a1..5ef62e47fb 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -314,6 +314,11 @@ wrapper for accessing libusb-1.0.") (base32 "00pnh9zf3iwdji2faccns7vagbmbrwbj9a8zp9s53a6rqaa9czis")))) (build-system gnu-build-system) + (arguments + ;; Tests fail randomly when run in parallel because several of them write + ;; and read to/from the same file--e.g., "4.plist" is accessed by + ;; 'large.test' and 'largecmp.test'. + '(#:parallel-tests? #f)) (inputs `(("python" ,python))) (native-inputs diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 697a04e098..d80451ce4d 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -109,9 +109,9 @@ ;; Latest version of Guix, which may or may not correspond to a release. ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. - (let ((version "0.16.0") - (commit "0c329bf4b0c00abdc9a7d9c818d36d4d60b3005d") - (revision 14)) + (let ((version "1.0.0") + (commit "326dcbf1b3c30aa525185fda435c34cb9495dd04") + (revision 1)) (package (name "guix") @@ -127,7 +127,7 @@ (commit commit))) (sha256 (base32 - "1403vrazx46w9hcvqjyxa4ipwvqv0432f6rsn4981w1n3p1j4mf6")) + "0k9v9lh69q353x055id1sq1gx4p8idg8ifrgidv5s73wdil2cflm")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments |