From ebe9d865dde17ceecdafe8e000ff88542d47a344 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:46:46 +0200 Subject: gnu: cutter: Update to 1.10.3. * gnu/packages/engineering.scm (cutter): Update to 1.10.3. --- gnu/packages/engineering.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index be86848538..07f4d0cf96 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2175,7 +2175,7 @@ simulation.") (define-public cutter (package (name "cutter") - (version "1.10.1") + (version "1.10.3") (source (origin (method git-fetch) @@ -2184,8 +2184,7 @@ simulation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1gvsrcskcdd1hxrjpkpc657anmfs25f174vxk4wzvn385rnmrxd3")))) + (base32 "0qj8jyij02nif4jpirl09ygwnv8a9zi3vkb5sf5s8mg7qwlpnvyk")))) (build-system gnu-build-system) (arguments `(#:phases @@ -2194,8 +2193,8 @@ simulation.") (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (radare2 (assoc-ref inputs "radare2"))) - ;; fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib - ;; override `qmake PREFIX=` + ;; Fix pkg-config detection ./src/lib_radare2.pri:PREFIX=/usr/lib + ;; override `qmake PREFIX=`. (substitute* "./src/lib_radare2.pri" (("PREFIX") "R2PREFIX") (("R2PREFIX=/usr") (string-append "R2PREFIX=" radare2))) -- cgit v1.2.3 From b5c6264188e8071a2ee521eb0257b3d9d34bffeb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:51:02 +0200 Subject: gnu: radare2: Remove pointless configure flag. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Remove unrecognised ‘--without-nonpic’ from #:configure-flags. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 07f4d0cf96..6628a45482 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1364,8 +1364,8 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-openssl" - "--without-nonpic" "--with-rpath" "--with-syscapstone") + (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" + "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) (inputs -- cgit v1.2.3 From 655a0c65be6b3653c61310e730d5128670ffa5b1 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 20:52:39 +0200 Subject: gnu: radare2: Use OUTPUTS keyword. * gnu/packages/engineering.scm (radare2)[arguments]: Substitute OUTPUTS for %OUTPUTS. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6628a45482..9132743626 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1360,8 +1360,8 @@ bindings for Python, Java, OCaml and more.") #:phases (modify-phases %standard-phases (add-before 'configure 'mklibdir - (lambda* (#:key inputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref %outputs "out") "/lib")) + (lambda* (#:key inputs outputs #:allow-other-keys) + (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" -- cgit v1.2.3 From 6454e5ac500264babc9df669885568d13f08be1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:11 +0200 Subject: gnu: radare2: Remove impotent snippet. * gnu/packages/engineering.scm (radare2)[source]: Remove a snippet that does nothing. --- gnu/packages/engineering.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9132743626..a46f244469 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1343,17 +1343,7 @@ bindings for Python, Java, OCaml and more.") (sha256 (base32 "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "libr/asm/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/parse/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - (substitute* "libr/bin/p/Makefile" - (("LDFLAGS\\+=") "LDFLAGS+=-Wl,-rpath=$(LIBDIR) ")) - #t)))) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments '(#:tests? #f ; tests require git and network access -- cgit v1.2.3 From d01269d251ebdc4417374ea817f406c4ecd004a5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:16:29 +0200 Subject: gnu: radare2: Update to 4.4.0. * gnu/packages/engineering.scm (radare2): Update to 4.4.0. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a46f244469..3653f10aeb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1334,7 +1334,7 @@ bindings for Python, Java, OCaml and more.") (define-public radare2 (package (name "radare2") - (version "4.2.1") + (version "4.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1342,7 +1342,7 @@ bindings for Python, Java, OCaml and more.") (commit version))) (sha256 (base32 - "14b9433cgc2nabhz836zfgvgh2dwailcmvy05krsa0inmzbvx9fg")) + "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From 45a21ee45d1781cb6a4dad1d53eeef16cd573436 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:02:40 +0200 Subject: gnu: fastcap: Use HTTPS home page URI. * gnu/packages/engineering.scm (fastcap)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3653f10aeb..edf701e087 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -535,7 +535,7 @@ featuring various improvements and bug fixes."))) (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated capacitance extraction program") (description "Fastcap is a capacitance extraction program based on a -- cgit v1.2.3 From ebeaf280bc269411b040a3f8d4d883b99db57533 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 27 May 2020 02:03:23 +0200 Subject: gnu: fasthenry: Use HTTPS home page URI. * gnu/packages/engineering.scm (fasthenry)[home-page]: Use HTTPS URI. --- gnu/packages/engineering.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index edf701e087..369110a044 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -583,7 +583,7 @@ multipole-accelerated algorithm.") (copy-recursively "doc" doc) (copy-recursively "examples" examples) #t)))))) - (home-page "http://www.rle.mit.edu/cpg/research_codes.htm") + (home-page "https://www.rle.mit.edu/cpg/research_codes.htm") (synopsis "Multipole-accelerated inductance analysis program") (description "Fasthenry is an inductance extraction program based on a -- cgit v1.2.3 From 5507ff8e850bf443965a8aa03385895714ae02d2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 21:59:26 +0200 Subject: gnu: radare2: Remove unused gmp input. * gnu/packages/engineering.scm (radare2)[inputs]: Remove gmp. --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 369110a044..96526cbbf6 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1358,11 +1358,11 @@ bindings for Python, Java, OCaml and more.") "--with-openssl" "--with-rpath") #:make-flags (list "CC=gcc"))) + ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs - `(("openssl" ,openssl) - ("zip" ,zip) - ("gmp" ,gmp) - ("capstone" ,capstone))) + `(("capstone" ,capstone) + ("openssl" ,openssl) + ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "https://radare.org/") -- cgit v1.2.3 From ecc8cd984e69d33c625df775fb779275c90612a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 25 May 2020 22:01:31 +0200 Subject: gnu: radare2: Add more inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (radare2)[arguments]: Add ‘--with-sysxxhash’ to #:configure-flags. [inputs]: Add libuv. [propagated-inputs]: Add xxhash. --- gnu/packages/engineering.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 96526cbbf6..2102f8d295 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -61,6 +61,7 @@ #:use-module (gnu packages commencement) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages digest) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) #:use-module (gnu packages fontutils) @@ -82,6 +83,7 @@ #:use-module (gnu packages image) #:use-module (gnu packages image-processing) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages linux) ;FIXME: for pcb #:use-module (gnu packages m4) #:use-module (gnu packages maths) @@ -1354,17 +1356,25 @@ bindings for Python, Java, OCaml and more.") (mkdir-p (string-append (assoc-ref outputs "out") "/lib")) #t))) #:configure-flags - (list "--with-sysmagic" "--with-syszip" "--with-syscapstone" - "--with-openssl" "--with-rpath") + (list "--with-openssl" + "--with-rpath" + "--with-syscapstone" + "--with-sysmagic" + "--with-syszip" + "--with-sysxxhash") #:make-flags (list "CC=gcc"))) ;; TODO: Add gmp and libzip and make the build system actually find them. (inputs `(("capstone" ,capstone) + ("libuv" ,libuv) ("openssl" ,openssl) ("zip" ,zip))) (native-inputs `(("pkg-config" ,pkg-config))) + (propagated-inputs + ;; In the Libs: section of r_hash.pc. + `(("xxhash" ,xxhash))) (home-page "https://radare.org/") (synopsis "Reverse engineering framework") (description -- cgit v1.2.3