From c8e2219cfb914429b6409dbef1491652b910f70b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 20 Dec 2016 17:30:25 +0100 Subject: gnu: guix: Update to 0.12.0. * gnu/packages/package-management.scm (guix-0.11.0): Rename to... (guix-0.12.0): ... this. Adjust users. (guix): Set to GUIX-0.12.0. --- gnu/packages/package-management.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 7083a1664c..bc30cb5f47 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -68,17 +68,17 @@ (define (boot-guile-uri arch) arch "-linux" "/20131110/guile-2.0.9.tar.xz"))) -(define-public guix-0.11.0 +(define-public guix-0.12.0 (package (name "guix") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-" version ".tar.gz")) (sha256 (base32 - "1cwrbpv4dq7aczwksmcfw9w8r2bzrb5ld9zvjcr90i804hjpcb93")))) + "1jgy5mlygmhxdqhrp6vr8w83ndcm5mk64xfravr8l2d7hq8y40b2")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list @@ -227,7 +227,7 @@ (define guix-devel ;; Note: use a very short commit id; with a longer one, the limit on ;; hash-bang lines would be exceeded while running the tests. (let ((commit "8d125cfc2e5cb0825bb40893ec3e940f85f1b235")) - (package (inherit guix-0.11.0) + (package (inherit guix-0.12.0) (version (string-append "0.11.0-8." (string-take commit 4))) (source (origin (method git-fetch) @@ -241,7 +241,7 @@ (define guix-devel "0h73m1zad67qqn7ygypcqscicvqj31wwkxsr85d5lr77v6bx7b6z")) (file-name (string-append "guix-" version "-checkout")))) (arguments - (substitute-keyword-arguments (package-arguments guix-0.11.0) + (substitute-keyword-arguments (package-arguments guix-0.12.0) ((#:configure-flags flags) ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a ;; reference to Graphviz, whose closure is pretty big (too big for @@ -259,7 +259,7 @@ (define guix-devel (zero? (system* "sh" "bootstrap"))))))))))) -(define-public guix guix-devel) +(define-public guix guix-0.12.0) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical -- cgit v1.2.3 From 62a3179395d5da1352083df77cf9df35531ff381 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 20 Dec 2016 18:06:00 +0100 Subject: gnu: guix: Update development snapshot. * gnu/packages/package-management.scm (guix-devel): Update to c8e2219c. (guix): Set to GUIX-DEVEL. --- gnu/packages/package-management.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index bc30cb5f47..80e4cb006f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -226,9 +226,9 @@ (define guix-devel ;; ;; Note: use a very short commit id; with a longer one, the limit on ;; hash-bang lines would be exceeded while running the tests. - (let ((commit "8d125cfc2e5cb0825bb40893ec3e940f85f1b235")) + (let ((commit "c8e2219cfb914429b6409dbef1491652b910f70b")) (package (inherit guix-0.12.0) - (version (string-append "0.11.0-8." (string-take commit 4))) + (version (string-append "0.12.0-1." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -238,7 +238,7 @@ (define guix-devel (commit commit))) (sha256 (base32 - "0h73m1zad67qqn7ygypcqscicvqj31wwkxsr85d5lr77v6bx7b6z")) + "1w4mac0npnvixfll1fplipmkkbxa4rl5q5nbi4pb30fls3r5rgn6")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.12.0) @@ -259,7 +259,7 @@ (define guix-devel (zero? (system* "sh" "bootstrap"))))))))))) -(define-public guix guix-0.12.0) +(define-public guix guix-devel) (define (source-file? file stat) "Return true if FILE is likely a source file, false if it is a typical -- cgit v1.2.3 From b291b3271a025dfe41e1a7fdfadd393373b0128d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 20 Dec 2016 23:36:21 +0100 Subject: gnu: linux-libre: Avoid invalid "kconfig" input on armhf and mips64el. This fixes a bug whereby: guix build linux-libre -s armhf-linux would fail with: guix build: error: gnu/packages/linux.scm:231:2: package `linux-libre-4.8.15' has an invalid input: ("kconfig" #f) This led 'tests/guix-system.sh' to fail. * gnu/packages/linux.scm (make-linux-libre)[native-inputs]: Never add #f as a "kconfig" input. --- gnu/packages/linux.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 827ee8b37c..5d6fbbb148 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -242,13 +242,15 @@ (define* (make-linux-libre version hash supported-systems ("bc" ,bc) ("openssl" ,openssl) ("kmod" ,kmod) - ,@(if configuration-file - `(("kconfig" ,(configuration-file - (system->linux-architecture - (or (%current-target-system) - (%current-system))) - #:variant (version-major+minor version)))) - '()))) + ,@(match (and configuration-file + (configuration-file + (system->linux-architecture + (or (%current-target-system) (%current-system))) + #:variant (version-major+minor version))) + (#f ;no config for this platform + '()) + ((? string? config) + `(("kconfig" ,config)))))) (arguments `(#:modules ((guix build gnu-build-system) (guix build utils) -- cgit v1.2.3 From 7aa8785c4153a87e2e5d0697ad349ebc8e3b8500 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 21 Dec 2016 10:32:17 +0100 Subject: gnu: guix: Update development snapshot. * gnu/packages/package-management.scm (guix-devel): Update to b291b327. --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 80e4cb006f..50db2666a7 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -226,9 +226,9 @@ (define guix-devel ;; ;; Note: use a very short commit id; with a longer one, the limit on ;; hash-bang lines would be exceeded while running the tests. - (let ((commit "c8e2219cfb914429b6409dbef1491652b910f70b")) + (let ((commit "b291b3271a025dfe41e1a7fdfadd393373b0128d")) (package (inherit guix-0.12.0) - (version (string-append "0.12.0-1." (string-take commit 4))) + (version (string-append "0.12.0-2." (string-take commit 4))) (source (origin (method git-fetch) (uri (git-reference @@ -238,7 +238,7 @@ (define guix-devel (commit commit))) (sha256 (base32 - "1w4mac0npnvixfll1fplipmkkbxa4rl5q5nbi4pb30fls3r5rgn6")) + "1hris387xn2wk4lcl20x1zyhiz96060w34xs1x13b4vmvkkvcpg4")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.12.0) -- cgit v1.2.3 From 7af6ecab6e7b703de5fc3870bc34a8c8172efc53 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 21 Dec 2016 14:26:21 +0100 Subject: gnu: guix: Really skip "pivot-root" test. This is a followup to fe9bdb581e6c4a62795f4ced6f4a5a8eab1a34e4 (which introduced 'test-equal' for the "pivot-root" test) and to 198eac2bca075d0e71e504f1e8c46fddc62171bb (which updated the regexps for skipped tests.) * gnu/packages/package-management.scm (guix-0.12.0)[arguments]: In 'disable-container-tests' phase, add "test-equal" to the regexp, so that "pivot-root" is really skipped. --- gnu/packages/package-management.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 50db2666a7..732dbc2ce3 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -121,7 +121,7 @@ (define (copy arch) ;; XXX FIXME: These tests fail within the build container. (lambda _ (substitute* "tests/syscalls.scm" - (("^\\(test-assert \"(clone|setns|pivot-root)\"" all) + (("^\\(test-(assert|equal) \"(clone|setns|pivot-root)\"" all) (string-append "(test-skip 1)\n" all))) (substitute* "tests/containers.scm" (("^\\(test-(assert|equal)" all) -- cgit v1.2.3