diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-06 07:09:30 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-03-06 07:09:30 +0100 |
commit | 188c3a4d03a2dda798228cf4d759ef02ea654469 (patch) | |
tree | ba37a7f375103d07e71e66c29c05ce5175a9f0e9 /pkgs/applications/science | |
parent | 43ccb035b910d73259717d76370ad4ee6d654014 (diff) | |
parent | 05aeaea23d5a56b93ae5886e0d11b6c038971a82 (diff) | |
download | nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar.gz nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar.bz2 nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar.lz nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar.xz nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.tar.zst nixpkgs-188c3a4d03a2dda798228cf4d759ef02ea654469.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/workcraft/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/science/math/gmsh/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/science/logic/workcraft/default.nix b/pkgs/applications/science/logic/workcraft/default.nix index c0d6d541d6b..685d6ee4861 100644 --- a/pkgs/applications/science/logic/workcraft/default.nix +++ b/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "11dk00b17yhk7cv8zms4nlffc0qwgsapimzr8csb89qmgabd7rj3"; + sha256 = "1sfbxmk71gp7paw4l5azqr0lsgsyp4308gx2jz8w4k3nasfshz25"; }; buildInputs = [ makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://workcraft.org/; + homepage = "https://workcraft.org/"; description = "Framework for interpreted graph modeling, verification and synthesis"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index e55bcd8fe21..e65cf52d581 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.5.2"; + version = "4.5.4"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "10i6i1s68lkccnl73lzr04cf1hc5rd8b7dpiaxs1vzrj1ljgw801"; + sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c"; }; buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index 7536d071f6b..fadd60d9ebb 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020"; + name = "gromacs-2020.1"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.tar.gz"; - sha256 = "00ds83n5wnm7g7wq91jycp8h82vnam5b4rwg3fv9rk9x5ca5czj7"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; + sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; }; nativeBuildInputs = [ cmake ]; |