diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:06 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2017-01-02 00:54:17 +0100 |
| commit | 5a67b130b9b4d72a4398b8f0cd4893674213fb20 (patch) | |
| tree | 81354bb3b5c2447bda9e93dbc94acdbc4d913c25 /pkgs/applications/science | |
| parent | 2bb33130cc3a00a8fb1a6afb341cf31079061e5a (diff) | |
| parent | 2c288548b93b657365c27a0132a43ba0080870cc (diff) | |
| download | nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.gz nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.bz2 nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.lz nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.xz nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.tar.zst nixlib-5a67b130b9b4d72a4398b8f0cd4893674213fb20.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/logic/lean/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/science/misc/fityk/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/physics/sherpa/default.nix | 23 |
3 files changed, 28 insertions, 5 deletions
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index d1f4bc0a4145..af338338550f 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "2016-12-08"; + version = "2016-12-30"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618"; - sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l"; + rev = "fd4fffea27c442b12a45f664a8680ebb47482ca3"; + sha256 = "1izbjxbr1nvv5kv2b7qklqjx2b1qmwrxhmvk0f2lrl9pxz9h0bmd"; }; buildInputs = [ gmp mpfr cmake gperftools ]; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 7d9f8542eed3..1c1cac203f8b 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -3,7 +3,7 @@ let name = "fityk"; - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation { name = "${name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "wojdyr"; repo = "fityk"; rev = "v${version}"; - sha256 = "07xzhy47q5ddg1qn51qds4wp6r5g2cx8bla0hm0a9ipr2hg92lm9"; + sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix new file mode 100644 index 000000000000..d863964ad90a --- /dev/null +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, gfortran, sqlite }: + +stdenv.mkDerivation rec { + name = "sherpa-${version}"; + version = "2.2.1"; + + src = fetchurl { + url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; + sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali"; + }; + + buildInputs = [ gfortran sqlite ]; + + enableParallelBuilding = true; + + meta = { + description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; + license = stdenv.lib.licenses.gpl2; + homepage = https://sherpa.hepforge.org; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} |