From dc57d527aee4eb18ec5fb345f90d6637bbd1a4d2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 3 Nov 2015 09:37:52 +0100 Subject: gnu: guix: Update development snapshot. * gnu/packages/package-management.scm (guix-0.8.3)[arguments]: In 'disable-container-tests' phase, modify "tests/guix-environment-container.sh". Add 'set-SHELL' phase. * gnu/packages/package-management.scm (guix-devel): Update to b485f75. --- gnu/packages/package-management.scm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 65464f7691..c1ef2e15c4 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -82,6 +82,7 @@ (string-append "--with-libgcrypt-prefix=" (assoc-ref %build-inputs "libgcrypt"))) + #:parallel-tests? #f ;work around #:phases (modify-phases %standard-phases (add-before 'configure 'copy-bootstrap-guile @@ -117,7 +118,17 @@ (substitute* "tests/containers.scm" (("^\\(test-assert" all) (string-append "(test-skip 1)\n" all))) + (when (file-exists? "tests/guix-environment-container.sh") + (substitute* "tests/guix-environment-container.sh" + (("guix environment --version") + "exit 77\n"))) #t)) + (add-before 'check 'set-SHELL + (lambda _ + ;; 'guix environment' tests rely on 'SHELL' having a + ;; correct value, so set it. + (setenv "SHELL" (which "sh")) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) @@ -184,7 +195,7 @@ the Nix package manager.") ;; ;; Note: use a short commit id; when using the long one, the limit on socket ;; file names is exceeded while running the tests. - (let ((commit "abbe2c6")) + (let ((commit "b485f75")) (package (inherit guix-0.8.3) (version (string-append "0.8.3." commit)) (source (origin @@ -194,7 +205,7 @@ the Nix package manager.") (commit commit))) (sha256 (base32 - "1zgjj5knpz3qbbqdjm4yh436bzfgasc6p0k3xnx58hfjd88mdsga")) + "1frn74y5c3n91qxs5b3sxbr8ai43s6svlb2djfnp7nqbr1ax3mph")) (file-name (string-append "guix-" version "-checkout")))) (arguments (substitute-keyword-arguments (package-arguments guix-0.8.3) -- cgit v1.2.3 ell.scm?id=22c8783dff1f068f46f27f14cd67020f309e06a2'>gnu: Add ghc-6.10....* gnu/packages/haskell.scm (ghc-6.10): New variable. Ricardo Wurmus 2022-10-31gnu: ghc-6.6: Patch more references to /bin/sh....* gnu/packages/haskell.scm (ghc-6.6)[arguments]: Patch references to /bin/sh in Cabal and process internals. Ricardo Wurmus 2022-10-28gnu: Add ghc-6.6....* gnu/packages/haskell.scm (ghc-6.6): New variable. Ricardo Wurmus 2022-10-28gnu: ghc-6.0: Adjust configuration....* gnu/packages/haskell.scm (ghc-6.0)[arguments]: Pass --enable-src-tree-happy option; remove --with-hc option because we use the same GHC for everything; add --with-gcc option to embed absolute file name of GCC. [native-inputs]: Remove unused python-2. Ricardo Wurmus 2022-10-28gnu: ghc-4: Embed absolute file name of GCC in GHC....* gnu/packages/haskell.scm (ghc-4)[arguments]: Pass "--with-gcc" option to configure script. Ricardo Wurmus 2022-10-27gnu: Add ghc-6.0....* gnu/packages/haskell.scm (ghc-6.0): New variable. Ricardo Wurmus 2022-10-27gnu: ghc-4: Build full compiler using provided *.hc files....* gnu/packages/haskell.scm (ghc-4)[source]: Remove patch. [arguments]: Change to build full compiler. [native-inputs]: Remove default binutils and gcc; add tarball for hc files. * gnu/packages/patches/ghc-4.patch: Delete patch. * gnu/local.mk (dist_patch_DATA): Remove it. Ricardo Wurmus 2022-10-16gnu: ghc-4: Use Perl 5.6...* gnu/packages/haskell.scm (ghc-4)[native-inputs]: Replace perl-5.14 with perl-5.6. Ricardo Wurmus 2022-10-12Merge remote-tracking branch 'origin/master' into staging...Conflicts: gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/kde-frameworks.scm gnu/packages/video.scm Efraim Flashner 2022-10-02gnu: Add ghc-9.0....* gnu/packages/haskell.scm (ghc-9.0): New variable. Signed-off-by: Efraim Flashner <efraim@flashner.co.il> itd 2022-08-23gnu: ghc-8.10: Build using ghc-8.6....* gnu/packages/haskell.scm (ghc-8.10)[native-inputs]: Replace ghc-8.8 with ghc-8.6. Efraim Flashner 2022-08-23gnu: ghc-8.10: Rewrite using G-exps....* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Rewrite using g-exps. Efraim Flashner 2022-08-23gnu: ghc-8.10: Add phase unconditionally....* gnu/packages/haskell.scm (ghc-8.10)[arguments]: Apply custom 'skip-failing-tests-i686 phase for all architectures. Efraim Flashner 2022-08-23gnu: ghc-8.8: Rewrite using G-exps....* gnu/packages/haskell.scm (ghc-8.8)[arguments]: Rewrite using g-exps. Remove trailing #t from phases. Efraim Flashner 2022-08-23gnu: ghc-8.6: Rewrite using G-exps....* gnu/packages/haskell.scm (ghc-8.6)[arguments]: Rewrite using g-exps. Remove trailing #t from phases. Efraim Flashner 2022-08-23gnu: ghc-8.4: Modernize package....* gnu/packages/haskell.scm (ghc-8.4)[inputs]: Use inherited inputs. [arguments]: Rewrite using g-exps. Adjust to use inherited package arguments. Use inherited 'unpack-testsuite, 'fix environment phases. Remove redundant 'fix-references phase. (ghc-8.8)[arguments]: Adjust phases based on changed inherited phases. Efraim Flashner 2022-08-23gnu: ghc-8.0: Modernize package....* gnu/packages/haskell.scm (ghc-8.0)[arguments]: Rewrite using g-exps. Unpack testsuite tarball from the store. Remove trailing #t from phases. [inputs]: Remove input labels. Move ghc-testsuite ... [native-inputs]: ... to here. Efraim Flashner 2022-08-23gnu: ghc-7: Update to 7.10.3....* gnu/packages/haskell.scm (ghc-7): Update to 7.10.3. Efraim Flashner 2022-08-21gnu: ghc-7: Unpack tarballs from the store....* gnu/packages/haskell.scm (ghc-7)[arguments]: Adjust custom 'unpack-bin and 'unpack-testsuite-and-fix-bins phases to unpack tarballs directly from the store. Efraim Flashner 2022-08-21gnu: ghc-7: Rewrite arguments using G-expressions....* gnu/packages/haskell.scm (ghc-7)[arguments]: Rewrite using G-expressions. Remove trailing #t from phases. Efraim Flashner