diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
|---|---|---|
| committer | Maximilian Bosch <maximilian@mbosch.me> | 2020-02-01 17:42:03 +0100 |
| commit | ea8ae88f0447b0cf7aa8a07844cac78e001f5622 (patch) | |
| tree | 3c9e5c92d6f3fd72d2a622ee39ddd52306010f28 /pkgs/applications/science | |
| parent | 1bb18d9e8dbe537225c8d6ae8476aae3c40df368 (diff) | |
| parent | 5ff1a53a32b332e3b1a1e295e12e184c65833d13 (diff) | |
| download | nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar.gz nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar.bz2 nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar.lz nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar.xz nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.tar.zst nixlib-ea8ae88f0447b0cf7aa8a07844cac78e001f5622.zip | |
Merge branch 'staging' into glibc230
Diffstat (limited to 'pkgs/applications/science')
4 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index 69dece88c276..fea8da41d70a 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, fltk, libjpeg }: stdenv.mkDerivation rec { - version = "4.7"; + version = "5.0"; pname = "seaview"; src = fetchurl { url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; - sha256 = "0fhyq7dcn0izhwcfin9ajsr7kmmsqm9f1np1rmhzg4digfwqb29n"; + sha256 = "0gzjqf5mm91pa1drwxvz229bv6l995npdggngszh6z6j4pfh8j7c"; }; buildInputs = [ fltk libjpeg ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index c940fd4ac342..c47d055a32ba 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.024"; + version = "4.026"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "0nmjazdv36ksjp8ys48c1grlzkd6yx3zhcd9y165d4sjm3m1pffs"; + sha256 = "1b4zxwgd780yxql11r2333qhl7ki5jxh9jxlyhv9xqml9aq8myva"; }; enableParallelBuilding = true; buildInputs = [ perl flex bison ]; - postInstall = '' - sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc} - ''; - meta = { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 854a62a5538d..fa7c3dd5e95f 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "0saznk2mjbhp3j57imy2p2j0938026bw5m5gqbj59vcvk1rwwl22"; + sha256 = "16bxfnm30z94x36vr8vs6zd6fj55vnb7aypjl6hf7clk42040brc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 045a77cea27f..04115399c1a7 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.6"; + version = "2.2.8"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1cagkkz1pjl0pdf85w1qkwhx0afi3kxm1vnmfavq1zqhss7fc57i"; + sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; |