Update angr and dependencies

Julien LepillerMon May 29 11:13:13+0200 2017

07e7c91

Update angr and dependencies

more/packages/binary.scm

6565 
     `(#:tests? #t
6666 
       #:python ,python-2))))
6767
68-
68+
;; rc required by python2-angr
6969 
(define-public capstone
7070 
  (package
7171 
    (name "capstone")
72-
    (version "3.0.4")
72+
    (version "3.0.5-rc2")
7373 
    (source (origin
7474 
              (method url-fetch)
7575 
              (uri (string-append "https://github.com/aquynh/capstone/archive/"
…
7777 
              (file-name (string-append name "-" version ".tar.gz"))
7878 
              (sha256
7979 
               (base32
80-
                "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"))))
80+
                "1cqms9r2p43aiwp5spd84zaccp16ih03r7sjhrv16nddahj0jz2q"))))
8181 
    (build-system gnu-build-system)
8282 
    (arguments
8383 
     `(#:tests? #f
84-
       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
84+
       #:make-flags (list (string-append "PREFIX=" %output)
8585 
                          "CC=gcc")
8686 
       #:phases
8787 
       (modify-phases %standard-phases
88-
         (delete 'configure))))
88+
         (delete 'configure)
89+
         (add-before 'build 'fix-cstool-ldflags
90+
           (lambda* (#:key outputs #:allow-other-keys)
91+
             (substitute* "cstool/Makefile"
92+
               (("LDFLAGS =")
93+
                (string-append "LDFLAGS = -Wl,-rpath=" (assoc-ref outputs "out")
94+
                               "/lib"))))))))
8995 
    (home-page "http://www.capstone-engine.org")
9096 
    (synopsis "Disassembler")
9197 
    (description
…
110116 
         (add-after 'unpack 'chdir-and-fix-setup-py
111117 
           (lambda _
112118 
             (chdir "bindings/python")
113-
             (substitute* "setup.py" (("data_files=.*") ""))
119+
             (substitute* "setup.py" ((".*   build_libraries.*") ""))
114120 
             (substitute* "capstone/__init__.py"
115-
               (("_lib_path =.*")
116-
                (string-append "_lib_path = '"
117-
                               (assoc-ref %build-inputs "capstone")
118-
                               "/lib'\n")))
121+
               (("pkg_resources.resource_filename.*")
122+
                (string-append "'" (assoc-ref %build-inputs "capstone") "/lib',\n")))
119123 
             #t)))))))
120124 
121125 
(define-public python2-capstone
…
152156 
(define-public python2-archinfo
153157 
  (package
154158 
    (name "python2-archinfo")
155-
    (version "6.7.1.13")
159+
    (version "6.7.4.12")
156160 
    (source (origin
157161 
              (method url-fetch)
158162 
              (uri (pypi-uri "archinfo" version))
159163 
              (sha256
160164 
               (base32
161-
                "0x896mk98r6g9h3rxpqq9ri0s6v9n937jx0fzn7i61zn61n7whzw"))))
165+
                "1kfc9nk73i5rr3xz8mv00cp76p7dc62h9pd8hvnda414jhx7n0pb"))))
162166 
    (build-system python-build-system)
163167 
    (arguments
164168 
     `(#:python ,python-2))
…
177181 
              (method git-fetch)
178182 
              (uri (git-reference
179183 
                    (url "https://github.com/angr/vex.git")
180-
                    (commit "058410ede7ee74231255f6ae77cae8476c8a3ef4")))
184+
                    (commit "3a620e43ecc71cb9e5470995a45bbce4a600293f")))
181185 
              (sha256
182186 
               (base32
183-
                "02wi1705pa0xbwfqx3jj6g7nnvzi8whgmnd29fp1i7n4qz20gcgb"))
187+
                "1qxpwi9961140dnys1iywm043nbm13qg2vw9xi1bjjdh80hbnfw4"))
184188 
              (file-name (string-append name "-" version))))
185189 
    (build-system gnu-build-system)
186190 
    (arguments
187191 
     `(#:make-flags
188-
       (list "CC=gcc")
192+
       (list "CC=gcc" "CC_NATIVE=gcc")
189193 
       #:tests? #f
190194 
       #:phases
191195 
       (modify-phases %standard-phases
192196 
         (delete 'configure)
197+
         (add-before 'build 'get-Makefile
198+
           (lambda _
199+
             (copy-file "Makefile-gcc" "Makefile")))
193200 
         (replace 'install
194201 
           (lambda* (#:key outputs #:allow-other-keys)
195202 
             (let* ((out (assoc-ref outputs "out"))
…
208215 
(define-public python2-pyvex
209216 
  (package
210217 
    (name "python2-pyvex")
211-
    (version "6.7.1.31")
218+
    (version "6.7.4.12")
212219 
    (source (origin
213220 
              (method url-fetch)
214221 
              (uri (pypi-uri "pyvex" version))
215222 
              (sha256
216223 
               (base32
217-
                "0wwz1jqrjbkg8j7mr3wrgw84aaph7h9v2r7j4q035rn7b38n5x54"))))
224+
                "1x57aq96ka7gz6qcj9zqwdcylfks4q3iiykismyk1g0vp68qlwv9"))))
218225 
    (build-system python-build-system)
219226 
    (inputs `(("angr-vex" ,angr-vex)))
220227 
    (propagated-inputs
…
304311 
(define-public python2-simuvex
305312 
  (package
306313 
    (name "python2-simuvex")
307-
    (version "6.7.1.31")
314+
    (version "6.7.4.12")
308315 
    (source (origin
309316 
              (method url-fetch)
310317 
              (uri (pypi-uri "simuvex" version))
311318 
              (sha256
312319 
               (base32
313-
                "150jwf55pib7ndz7bjb4fxifqqgdxx7n1f5qa87mz6349qvi1xji"))
320+
                "03rqdk7f1ynm6p50rbl4abq6hgnfvb7qd5k26m7cyxjii09waa2x"))
314321 
              (modules '((guix build utils)))
315322 
              (snippet
316323 
               '(substitute* "setup.py"
…
342349 
(define-public python2-cle
343350 
  (package
344351 
    (name "python2-cle")
345-
    (version "6.7.1.31")
352+
    (version "6.7.4.12")
346353 
    (source (origin
347354 
              (method url-fetch)
348355 
              (uri (pypi-uri "cle" version))
349356 
              (sha256
350357 
               (base32
351-
                "0llk54f9p3b73f1pk19axlhw8yw80fdv07jkghqmqwd6xrnpnmmc"))
358+
                "1fx21jx2nmc5lbz7hgpz4p7ccvzrnrcnf0wj2fbqdyjb9s0w2sfw"))
352359 
              (modules '((guix build utils)))
353360 
              (snippet
354361 
               '(substitute* "setup.py"
…
373380 
(define-public python2-angr
374381 
  (package
375382 
    (name "python2-angr")
376-
    (version "6.7.1.31")
383+
    (version "6.7.4.12")
377384 
    (source (origin
378385 
              (method url-fetch)
379386 
              (uri (pypi-uri "angr" version))
380387 
              (sha256
381388 
               (base32
382-
                "19msllsjwc869824sx1qah6vnb03z22s71fph215ykbbb2843p1k"))))
389+
                "0cqqakh2drb593wcbdcq0vq3pcf1ckxwy486cg378667lrb4042i"))))
383390 
    (build-system python-build-system)
384391 
    (arguments
385392 
     `(#:python ,python-2))
more/packages/python.scm
7575 
(define-public python-bintrees
7676 
  (package
7777 
    (name "python-bintrees")
78-
    (version "2.0.4")
78+
    (version "2.0.7")
7979 
    (source (origin
8080 
              (method url-fetch)
81-
              (uri (pypi-uri "bintrees" version))
81+
              (uri (pypi-uri "bintrees" version ".zip"))
8282 
              (sha256
8383 
               (base32
84-
                "1q71md58i33qpjhwgi9ph9hpgch1dy2i6n4qljyl0x410rhikfvc"))))
84+
                "0w0js514awl9qwamcr71spi8mmv7q3n4mgrqrnmr9w6f09k5wrv0"))))
8585 
    (build-system python-build-system)
86+
    (native-inputs `(("unzip" ,unzip)))
8687 
    (home-page "https://github.com/mozman/bintrees")
8788 
    (synopsis "Provides Binary- RedBlack- and AVL-Trees written in Python and Cython/C")
8889 
    (description "This package provides Binary- RedBlack- and AVL-Trees written
…
99100 
(define-public python2-dpkt
100101 
  (package
101102 
    (name "python2-dpkt")
102-
    (version "1.8.8")
103+
    (version "1.9.1")
103104 
    (source (origin
104105 
              (method url-fetch)
105106 
              (uri (pypi-uri "dpkt" version))
106107 
              (sha256
107108 
               (base32
108-
                "004qsqzg3fwkh623l1y8j62ai166hr02y192s7n1hs166kjjb5fr"))
109+
                "0rr9ygczhxkfb61778jx0cxs0sq46zwlcj5l3wn6xmd3iy3yx9y6"))
109110 
              (modules '((guix build utils)))
110111 
              (snippet
111112 
               '(substitute* "setup.py"
…
185186 
(define-public python-progressbar2
186187 
  (package
187188 
    (name "python-progressbar2")
188-
    (version "3.12.0")
189+
    (version "3.20.0")
189190 
    (source (origin
190191 
              (method url-fetch)
191192 
              (uri (pypi-uri "progressbar2" version))
192193 
              (sha256
193194 
               (base32
194-
                "16r21cpjvv0spf4mymgpy7hx6977iy11k44n2w9kipwg4lhwh02k"))))
195+
                "1xz5l3598bl2r1j8h6dqljbjf44f2d137ppi0l381adz4zd38vd1"))))
195196 
    (build-system python-build-system)
196197 
    (native-inputs
197198 
     `(("pytest-runner" ,python-pytest-runner)
more/packages/smt.scm
8787 
(define-public python2-claripy
8888 
  (package
8989 
    (name "python2-claripy")
90-
    (version "6.7.1.31")
90+
    (version "6.7.4.12")
9191 
    (source (origin
9292 
              (method url-fetch)
9393 
              (uri (pypi-uri "claripy" version))
9494 
              (sha256
9595 
               (base32
96-
                "0jpnqggx40kfj9cc48aylxsaqy61isl2yb3agib8nqh9v4j1rwqa"))
96+
                "0w6f2jvqajmw1mmdbdzvvs71fsv62z73w0q6jz3sap7mhlwj3vrd"))
9797 
              (modules '((guix build utils)))
9898 
              (snippet
9999 
               `(substitute* "setup.py"