diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-02-24 19:37:03 +0100 |
commit | 3941af527df6f27c88258c5d3b78720a07fe60ef (patch) | |
tree | 4747f74f32faef8a4f20bf7adf797ce57a8324fc /gnu/packages/fpga.scm | |
parent | d85f8e46dbc5a978fe7359c89cbb3167fb9c2029 (diff) | |
parent | 7daae3c9d09a4d27586824a1d1af99e7af454d26 (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/fpga.scm')
-rw-r--r-- | gnu/packages/fpga.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 46c917b0d5..dca67ad3ca 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -51,15 +51,15 @@ (revision "1")) (package (name "abc") - (version (string-append "0.0-" revision "-" (string-take commit 9))) + (version (git-version "0.0" revision commit)) (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip")) (file-name (string-append name "-" version "-checkout.zip")) (sha256 - (base32 - "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) + (base32 + "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0")))) (build-system gnu-build-system) (native-inputs `(("unzip" ,unzip))) @@ -75,7 +75,7 @@ (let* ((out (assoc-ref outputs "out")) (out-bin (string-append out "/bin"))) (install-file "abc" out-bin))))))) - (home-page "http://people.eecs.berkeley.edu/~alanmi/abc/") + (home-page "https://people.eecs.berkeley.edu/~alanmi/abc/") (synopsis "Sequential logic synthesis and formal verification") (description "ABC is a program for sequential logic synthesis and formal verification.") @@ -216,13 +216,13 @@ For synthesis, the compiler generates netlists in the desired format.") (revision "2")) (package (name "icestorm") - (version (string-append "0.0-" revision "-" (string-take commit 9))) + (version (git-version "0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/cliffordwolf/icestorm.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya")))) @@ -267,7 +267,7 @@ Includes the actual FTDI connector.") (uri (git-reference (url "https://github.com/YosysHQ/arachne-pnr.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 "1dqvjvgvsridybishv4pnigw9gypxh7r7nrqp9z9qq92v7c5rxzl")))) |