diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/gcc.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/guile-wm.scm | 26 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 35 | ||||
| -rw-r--r-- | gnu/packages/patches/pulseaudio-test-timeouts.patch | 19 | ||||
| -rw-r--r-- | gnu/packages/patches/pulseaudio-volume-test.patch | 29 | ||||
| -rw-r--r-- | gnu/packages/pulseaudio.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/python.scm | 4 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 4 |
8 files changed, 49 insertions, 79 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 279cc8d950..cb7817c084 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,7 +186,7 @@ where the OS part is overloaded to denote a specific ABI---into GCC 'configure 'post-configure (lambda _ ;; Don't store configure flags, to avoid retaining references to - ;; build-time dependencies---e.g., `--with-ppl=/nix/store/xxx'. + ;; build-time dependencies---e.g., `--with-ppl=/gnu/store/xxx'. (substitute* "Makefile" (("^TOPLEVEL_CONFIGURE_ARGUMENTS=(.*)$" _ rest) "TOPLEVEL_CONFIGURE_ARGUMENTS=\n"))) diff --git a/gnu/packages/guile-wm.scm b/gnu/packages/guile-wm.scm index b05974c8ae..38c5959340 100644 --- a/gnu/packages/guile-wm.scm +++ b/gnu/packages/guile-wm.scm @@ -29,36 +29,26 @@ (define-public guile-xcb (package (name "guile-xcb") - (version "1.2") + (version "1.3") (source (origin (method url-fetch) (uri (string-append "http://www.markwitmer.com/dist/guile-xcb-" version ".tar.gz")) (sha256 (base32 - "009qrw46ay74z3mw8gz7jqvn90z9ilyhy00801w5vpyias02730y")))) + "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149")))) (build-system gnu-build-system) (arguments '(;; Parallel builds fail. #:parallel-build? #f - ;; The '.scm' files go to $(datadir), so set that to the - ;; standard value. #:configure-flags (list (string-append - "--datadir=" + "--with-guile-site-dir=" (assoc-ref %outputs "out") - "/share/guile/site/2.0")) - #:phases (alist-cons-before - 'configure 'set-go-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; The makefile sets the .go directory to Guile's - ;; own .go site directory, which is read-only. - ;; Change it to point to $out/share/guile/site/2.0. - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile.in" - (("^godir = .*$") - (string-append "godir = " out - "/share/guile/site/2.0\n"))))) - %standard-phases))) + "/share/guile/site/2.0") + (string-append + "--with-guile-site-ccache-dir=" + (assoc-ref %outputs "out") + "/share/guile/site/2.0")))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.0) ("xcb" ,xcb-proto))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index e1668b1d6b..b5e15400e1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -165,6 +165,8 @@ (substitute* ".config" (("^# CONFIG_CIFS.*$") "CONFIG_CIFS=m\n") + (("^# CONFIG_FUSE_FS.*$") + "CONFIG_FUSE_FS=m\n") (("^# CONFIG_([[:graph:]]*)VIRTIO([[:graph:]]*) .*$" _ before after) (string-append "CONFIG_" before "VIRTIO" @@ -899,7 +901,7 @@ processes currently causing I/O.") (base32 "071r6xjgssy8vwdn6m28qq1bqxsd2bphcd2mzhq0grf5ybm87sqb")))) (build-system gnu-build-system) - (native-inputs `(("util-linux" ,util-linux))) + (inputs `(("util-linux" ,util-linux))) (arguments '(#:configure-flags (list (string-append "MOUNT_FUSE_PATH=" (assoc-ref %outputs "out") @@ -909,7 +911,20 @@ processes currently causing I/O.") "/etc/init.d") (string-append "UDEV_RULES_PATH=" (assoc-ref %outputs "out") - "/etc/udev")))) + "/etc/udev")) + #:phases (alist-cons-before + 'build 'set-file-names + (lambda* (#:key inputs #:allow-other-keys) + ;; libfuse calls out to mount(8) and umount(8). Make sure + ;; it refers to the right ones. + (substitute* '("lib/mount_util.c" "util/mount_util.c") + (("/bin/(u?)mount" _ maybe-u) + (string-append (assoc-ref inputs "util-linux") + "/bin/" maybe-u "mount"))) + (substitute* '("util/mount.fuse.c") + (("/bin/sh") + (which "sh")))) + %standard-phases))) (home-page "http://fuse.sourceforge.net/") (synopsis "Support file systems implemented in user space") (description @@ -945,3 +960,19 @@ space, using the FUSE library. Mounting a union file system allows you to \"aggregate\" the contents of several directories into a single mount point. UnionFS-FUSE additionally supports copy-on-write.") (license bsd-3))) + +(define-public unionfs-fuse/static + (package (inherit unionfs-fuse) + (synopsis "User-space union file system (statically linked)") + (name (string-append (package-name unionfs-fuse) "-static")) + (source (origin (inherit (package-source unionfs-fuse)) + (modules '((guix build utils))) + (snippet + ;; Add -ldl to the libraries, because libfuse.a needs that. + '(substitute* "src/CMakeLists.txt" + (("target_link_libraries(.*)\\)" _ libs) + (string-append "target_link_libraries" + libs " dl)")))))) + (arguments + '(#:tests? #f + #:configure-flags '("-DCMAKE_EXE_LINKER_FLAGS=-static"))))) diff --git a/gnu/packages/patches/pulseaudio-test-timeouts.patch b/gnu/packages/patches/pulseaudio-test-timeouts.patch deleted file mode 100644 index ab818ad0aa..0000000000 --- a/gnu/packages/patches/pulseaudio-test-timeouts.patch +++ /dev/null @@ -1,19 +0,0 @@ -Increase the timeout of the thread test. Hydra was intermittedly -failing this test due to premature timeout, and slower machines -consistently fail. - -Patch by Mark H Weaver <mhw@netris.org>. - ---- pulseaudio/src/tests/thread-test.c.orig 2012-09-26 07:27:01.000000000 -0400 -+++ pulseaudio/src/tests/thread-test.c 2013-10-31 22:53:23.224000184 -0400 -@@ -152,6 +152,10 @@ - s = suite_create("Thread"); - tc = tcase_create("thread"); - tcase_add_test(tc, thread_test); -+ /* the default timeout is too small, -+ * set it to a reasonable large one. -+ */ -+ tcase_set_timeout(tc, 60 * 60); - suite_add_tcase(s, tc); - - sr = srunner_create(s); diff --git a/gnu/packages/patches/pulseaudio-volume-test.patch b/gnu/packages/patches/pulseaudio-volume-test.patch deleted file mode 100644 index 2cfa0cd6ca..0000000000 --- a/gnu/packages/patches/pulseaudio-volume-test.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix seemingly random failures of 'volume-test' in particular on 32-bit -machines. See <https://bugs.freedesktop.org/show_bug.cgi?id=72374> for -details. - -From 27e47c72a25846e107b6e450c3a1480a2742382e Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Sat, 14 Dec 2013 07:21:22 +0000 -Subject: volume-test: Increase the allowed number of rouding errors - -BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=72374 ---- -diff --git a/src/tests/volume-test.c b/src/tests/volume-test.c -index a2daf3e..1ab0b5c 100644 ---- a/src/tests/volume-test.c -+++ b/src/tests/volume-test.c -@@ -138,7 +138,13 @@ START_TEST (volume_test) { - pa_log("max deviation: %lu n=%lu", (unsigned long) md, (unsigned long) mdn); - - fail_unless(md <= 1); -- fail_unless(mdn <= 251); -+ -+ /* mdn counts the times there were rounding errors during the test. The -+ * number of rounding errors seems to vary slightly depending on the -+ * hardware. The original limit was 251 errors, but it was increased to 253 -+ * when the test was failing on Tanu's laptop. -+ * See https://bugs.freedesktop.org/show_bug.cgi?id=72374 */ -+ fail_unless(mdn <= 253); - } - END_TEST diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8bf48c2a89..db7e752ee6 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -134,7 +134,7 @@ parse JSON formatted strings back into the C representation of JSON objects.") (define pulseaudio (package (name "pulseaudio") - (version "4.0") + (version "5.0") (source (origin (method url-fetch) (uri (string-append @@ -142,10 +142,7 @@ parse JSON formatted strings back into the C representation of JSON objects.") version ".tar.xz")) (sha256 (base32 - "1bndz4l8jxyq3zq128gzp3gryxl6yjs66j2y1d7yabw2n5mv7kim")) - (patches (map search-patch - '("pulseaudio-test-timeouts.patch" - "pulseaudio-volume-test.patch"))))) + "0fgrr8v7yfh0byhzdv4c87v9lkj8g7gpjm8r9xrbvpa92a5kmhcr")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--localstatedir=/var" ;"--sysconfdir=/etc" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index ad1ac5c8f7..7997618fcf 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -46,7 +46,7 @@ (source (origin (method url-fetch) - (uri (string-append "http://www.python.org/ftp/python/" + (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (sha256 (base32 @@ -165,7 +165,7 @@ data types.") (source (origin (method url-fetch) - (uri (string-append "http://www.python.org/ftp/python/" + (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) (sha256 (base32 diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b6a777353f..a23289a30b 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -373,7 +373,7 @@ such as /etc files." ;; (not 'futime'), so the timestamp of ;; symlinks cannot be changed, and there ;; are symlinks here pointing to - ;; /nix/store, which is the host, + ;; /gnu/store, which is the host, ;; read-only store. (unless (eq? (stat:type s) 'symlink) (utime file 0 0 0 0)))) @@ -448,7 +448,7 @@ basic contents of the root file system of OS." (os-dir -> (derivation->output-path os-drv)) (build-gid (operating-system-build-gid os)) (profile (operating-system-profile-directory os))) - (return `((directory "/nix/store" 0 ,(or build-gid 0)) + (return `((directory ,(%store-prefix) 0 ,(or build-gid 0)) (directory "/etc") (directory "/var/log") ; for dmd (directory "/var/run/nscd") |