X-Git-Url: https://git.hcoop.net/jackhill/guix/guix.git/blobdiff_plain/a71fd671753c964b458c2842df27594c4896fd53..0646461a8c5c24d3493c69ef92aa3ae35028d5ea:/gnu/packages/debug.scm diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 0fc1f513ba..09efcbdd6c 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2016, 2017 Eric Bavier -;;; Copyright © 2016, 2017 Efraim Flashner +;;; Copyright © 2016, 2017, 2018 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -58,23 +58,24 @@ `(("perl" ,perl))) (arguments `(#:phases - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - ;; Makefile contains no install target - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (doc (string-append out "/share/doc/delta-" ,version))) - (begin - (mkdir-p bin) - (mkdir-p doc) - (for-each (lambda (h) - (install-file h doc)) - `("License.txt" ,@(find-files "www" ".*\\.html"))) - (for-each (lambda (b) - (install-file b bin)) - `("delta" "multidelta" "topformflat"))))) - (alist-delete 'configure %standard-phases)))) + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + ;; Makefile contains no install target + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (doc (string-append out "/share/doc/delta-" ,version))) + (begin + (mkdir-p bin) + (mkdir-p doc) + (for-each (lambda (h) + (install-file h doc)) + `("License.txt" ,@(find-files "www" ".*\\.html"))) + (for-each (lambda (b) + (install-file b bin)) + `("delta" "multidelta" "topformflat")))) + #t)) + (delete 'configure)))) (home-page "http://delta.tigris.org/") (synopsis "Heuristical file minimizer") (description @@ -114,23 +115,24 @@ program to exhibit a bug.") ("sys-cpu" ,perl-sys-cpu) ("term-readkey" ,perl-term-readkey))) (arguments - `(#:phases (alist-cons-after - 'install 'set-load-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Tell creduce where to find the perl modules it needs. - (let* ((out (assoc-ref outputs "out")) - (prog (string-append out "/bin/creduce"))) - (wrap-program - prog - `("PERL5LIB" ":" prefix - ,(map (lambda (p) - (string-append (assoc-ref inputs p) - "/lib/perl5/site_perl/" - ,(package-version perl))) - '("term-readkey" "exporter-lite" - "file-which" "getopt-tabular" - "regex-common" "sys-cpu")))))) - %standard-phases))) + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'set-load-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Tell creduce where to find the perl modules it needs. + (let* ((out (assoc-ref outputs "out")) + (prog (string-append out "/bin/creduce"))) + (wrap-program + prog + `("PERL5LIB" ":" prefix + ,(map (lambda (p) + (string-append (assoc-ref inputs p) + "/lib/perl5/site_perl/" + ,(package-version perl))) + '("term-readkey" "exporter-lite" + "file-which" "getopt-tabular" + "regex-common" "sys-cpu"))))) + #t))))) (home-page "http://embed.cs.utah.edu/creduce") (synopsis "Reducer for interesting code") (description @@ -141,27 +143,6 @@ intended for use by people who discover and report bugs in compilers and other tools that process C/C++ code.") (license ncsa))) -(define qemu-2.3.0 - (package - (inherit qemu-minimal) - (version "2.3.0") - (source (origin - (method url-fetch) - (uri (string-append - "http://wiki.qemu-project.org/download/qemu-" - version ".tar.bz2")) - (sha256 - (base32 - "120m53c3p28qxmfzllicjzr8syjv6v4d9rsyrgkp7gnmcgvvgfmn")))) - (arguments - ;; XXX: Disable tests because of GTester's rejection of duplicate test - ;; names, which wasn't addressed in this version of QEMU. - `(#:tests? #f - ,@(substitute-keyword-arguments (package-arguments qemu-minimal) - ((#:phases phases) - ;; We disable the tests so we skip the phase disabling the qga test. - `(modify-phases ,phases (delete 'disable-test-qga)))))))) - (define-public american-fuzzy-lop (let ((machine (match (or (%current-target-system) (%current-system)) @@ -175,7 +156,7 @@ tools that process C/C++ code.") (_ "UNSUPPORTED")))) (package (name "american-fuzzy-lop") - (version "2.49b") ;It seems all releases have the 'b' suffix + (version "2.52b") ;It seems all releases have the 'b' suffix (source (origin (method url-fetch) @@ -183,22 +164,22 @@ tools that process C/C++ code.") "afl-" version ".tgz")) (sha256 (base32 - "1lc8mpwlbyb1iil9961yfysp8l2l4nw0s07781m1haiz4jq2rigp")))) + "0ig0ij4n1pwry5dw1hk4q88801jzzy2cric6y2gd6560j55lnqa3")))) (build-system gnu-build-system) (inputs `(("custom-qemu" - ;; The afl-qemu tool builds qemu 2.3.0 with a few patches applied. - ,(package (inherit qemu-2.3.0) + ;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied. + ,(package (inherit qemu-minimal) (name "afl-qemu") (inputs `(("afl-src" ,source) - ,@(package-inputs qemu-2.3.0))) + ,@(package-inputs qemu-minimal))) ;; afl only supports using a single afl-qemu-trace executable, so ;; we only build qemu for the native target. (arguments `(#:modules ((srfi srfi-1) ,@%gnu-build-system-modules) - ,@(substitute-keyword-arguments (package-arguments qemu-2.3.0) + ,@(substitute-keyword-arguments (package-arguments qemu-minimal) ((#:configure-flags config-flags) ``(,(string-append "--target-list=" ,machine "-linux-user") ,@(remove (λ (f) (string-prefix? "--target-list=" f)) @@ -319,7 +300,7 @@ down the road.") (add-before 'configure 'repack-make (lambda _ (zero? (system* "tar" "cJf" "./make.tar.xz" ,make-dir)))) - (add-before 'configure 'bootstrap + (add-after 'unpack 'bootstrap (lambda _ (zero? (system* "autoreconf" "-vfi")))))))) (home-page "https://github.com/losalamos/stress-make")