diff options
| author | Marek Mahut <marek.mahut@gmail.com> | 2019-08-19 11:53:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 11:53:01 +0200 |
| commit | b8a9d33bcd0cabbd91faf8019ab40ce84f6b0f3d (patch) | |
| tree | 64862acc7ea0ea99cfb12091deae83bfcfe15104 /pkgs/applications/science | |
| parent | f728dcfacc5cf46e05c6242419f284524f7b6947 (diff) | |
| parent | a81bb36249386ef7fdb760c21907ebde1c76e16c (diff) | |
Merge pull request #66884 from markuskowa/upd-octopus
octopus: 9.0 -> 9.1
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/chemistry/octopus/default.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 4b580a6cf52e5..6dec5b3b11f1e 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack +{ stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps +, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook }: -let - version = "9.0"; - fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; +stdenv.mkDerivation rec { + pname = "octopus"; + version = "9.1"; -in stdenv.mkDerivation { - name = "octopus-${version}"; - - src = fetchurl { - url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "0p1gjykjnzm4m93mgjsmnxd0n2j381jk5kn3a7gkzxanixp60ilm"; + src = fetchFromGitLab { + owner = "octopus-code"; + repo = "octopus"; + rev = version; + sha256 = "1l5fqgllk7rij16q7a3la7qq6isy8a5n37vk400qcscw1v32s90h"; }; - nativeBuildInputs = [ perl procps fftw.dev ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; + nativeBuildInputs = [ perl procps autoreconfHook ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" "--with-blas=-lopenblas" "--with-lapack=-lopenblas" - "--with-fftw-prefix=${fftwAll}" + "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" ]; |