@@ -1,27 +1,26 @@
1−{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps
2−, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack
1+{ stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps
2+, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook
33}:
44
5−let
6− version = "9.0";
7− fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
5+stdenv.mkDerivation rec {
6+ pname = "octopus";
7+ version = "9.1";
88
9−in stdenv.mkDerivation {
10− name = "octopus-${version}";
11−
12− src = fetchurl {
13− url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
14− sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm";
9+ src = fetchFromGitLab {
10+ owner = "octopus-code";
11+ repo = "octopus";
12+ rev = version;
13+ sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h";
1514 };
1615
17− nativeBuildInputs = [ perl procps fftw.dev ];
18− buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ];
16+ nativeBuildInputs = [ perl procps autoreconfHook ];
17+ buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ];
1918
2019 configureFlags = [
2120 "--with-yaml-prefix=${libyaml}"
2221 "--with-blas=-lopenblas"
2322 "--with-lapack=-lopenblas"
24− "--with-fftw-prefix=${fftwAll}"
23+ "--with-fftw-prefix=${fftw.dev}"
2524 "--with-gsl-prefix=${gsl}"
2625 "--with-libxc-prefix=${libxc}"
2726 ];