diff options
| author | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-05-30 19:39:34 +0000 |
| commit | 2d382f3d981fc9e4a350badb43736c252415d27c (patch) | |
| tree | 3d5f7a96aa71be52c86f3c243b23424e319cc286 /pkgs/applications/science/electronics | |
| parent | 365379857fb561df949fc841e80458e317a1d682 (diff) | |
| parent | 2661511cdb39bd7612dd5311b46420785fc1eac8 (diff) | |
| download | nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.gz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.bz2 nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.lz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.xz nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.tar.zst nixlib-2d382f3d981fc9e4a350badb43736c252415d27c.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/applications/science/electronics')
| -rw-r--r-- | pkgs/applications/science/electronics/verilator/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/electronics/verilog/default.nix | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 825f342b4434..5c1cd75fd569 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "verilator-${version}"; - version = "3.874"; + version = "3.884"; src = fetchurl { url = "http://www.veripool.org/ftp/${name}.tgz"; - sha256 = "070binwp0jnashi6w45km26vrn6200b8hdg4179lcqyzdxi8c06j"; + sha256 = "1j159dg7m2ych5lwglb1qq1fgqh3kwhaa1r3jx84qdisg0icln2y"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index e68d2a4ab91a..d5c5f2ad1306 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchurl, gperf, flex, bison}: +{ stdenv, fetchFromGitHub, autoconf, gperf, flex, bison }: stdenv.mkDerivation rec { - name = "verilog-0.9.7"; + name = "iverilog-${version}"; + version = "2016.05.21"; - src = fetchurl { - url = "mirror://sourceforge/iverilog/${name}.tar.gz"; - sha256 = "0m3liqw7kq24vn7k8wvi630ljz0awz23r3sd4rcklk7vgghp4pks"; + src = fetchFromGitHub { + owner = "steveicarus"; + repo = "iverilog"; + rev = "45fbf558065c0fdac9aa088ecd34e9bf49e81305"; + sha256 = "137p7gkmp5kwih93i2a3lcf36a6k38j7fxglvw9y59w0233vj452"; }; - buildInputs = [ gperf flex bison ]; + patchPhase = '' + chmod +x $PWD/autoconf.sh + $PWD/autoconf.sh + ''; + + buildInputs = [ autoconf gperf flex bison ]; meta = { description = "Icarus Verilog compiler"; |