Merge pull request #58494 from markuskowa/upd-octopus

octopus: 8.3 -> 8.4
This commit is contained in:
Silvan Mosberger 2019-03-29 20:43:28 +01:00 committed by GitHub
commit aadb1cbe26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -3,7 +3,7 @@
}:
let
version = "8.3";
version = "8.4";
fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
in stdenv.mkDerivation {
@ -11,7 +11,7 @@ in stdenv.mkDerivation {
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
sha256 = "0nr3qmyfhp6fy8qrp4p43pl5xxfqgqg5g1c2775hxhpsi29xr7zf";
sha256 = "1fx5ssnf65b9ld7xs9rvvg8i80pblxpyhqkir0a7xshkk1g60z55";
};
nativeBuildInputs = [ perl procps fftw.dev ];

View file

@ -1,13 +1,13 @@
{ stdenv, fetchurl, gfortran, perl }:
let
version = "4.2.3";
version = "4.3.4";
in stdenv.mkDerivation {
name = "libxc-${version}";
src = fetchurl {
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz";
sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02";
sha256 = "0dw356dfwn2bwjdfwwi4h0kimm69aql2f4yk9f2kk4q7qpfkgvm8";
};
buildInputs = [ gfortran ];