Syzygial/ccpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octopus libxc: Change source as upstream tdft.org has disappeared

Browse Source
This commit is contained in:
Tyson Whitehead
2019-09-17 17:06:43 -04:00
parent db8655693e
commit 1c1b029b58
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/octopus/libxc.nix
View File

@@ -1,16 +1,18 @@
{ stdenv, fetchurl, gfortran, perl }: { stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl }:
let let
common = scripts: version: sha256: stdenv.mkDerivation rec { common = scripts: version: sha256: stdenv.mkDerivation rec {
inherit version; inherit version;
name = "libxc-${version}"; name = "libxc-${version}";
src = fetchurl { src = fetchFromGitLab {
url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; owner = "libxc";
repo = "libxc";
rev = version;
inherit sha256; inherit sha256;
}; };
buildInputs = [ gfortran perl ]; buildInputs = [ autoreconfHook gfortran perl ];
postPatch = '' postPatch = ''
patchShebangs ${scripts} patchShebangs ${scripts}
@@ -25,6 +27,6 @@ let
}; };
in { in {
libxc404 = common "scripts" "4.0.4" "0j4ics5hkwjs1grivy8762b05fr8in7wswncm8ym65fy7v27kvxj"; libxc404 = common "scripts" "4.0.4" "0h0rqmcsknr4b8ywadmpgfxzczhgfydn1p1qispmz2s97mcg8ws1";
libxc301 = common "src testsuite" "3.0.1" "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3"; libxc301 = common "src testsuite" "3.0.1" "108y6qnnsw7lhsyg25c42ilxy4klvsagnwdjy10xgnnwq9dh667k";
} }

16
pkgs/octopus/octopus.nix
View File

@@ -9,21 +9,23 @@
# nlopt (only provides libnlopt_cxx which requires c++ compiler for linking) # nlopt (only provides libnlopt_cxx which requires c++ compiler for linking)
# #
{ stdenv, fetchurl, gfortran, perl, openmpi { stdenv, fetchFromGitLab, autoreconfHook, gfortran, perl
, libxc3, blas, liblapack, gsl, fftw, netcdffortran , openmpi, libxc3, blas, liblapack, gsl, fftw, netcdffortran, arpack, libyaml }:
, arpack, libyaml }:
let let
common = version: sha256: stdenv.mkDerivation rec { common = version: sha256: stdenv.mkDerivation rec {
inherit version; inherit version;
name = "octopus-${version}"; name = "octopus-${version}";
src = fetchurl { src = fetchFromGitLab {
url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; owner = "octopus-code";
repo = "octopus";
rev = version;
inherit sha256; inherit sha256;
}; };
buildInputs = [ buildInputs = [
autoreconfHook
gfortran gfortran
perl perl
openmpi openmpi
@@ -40,7 +42,7 @@ let
# Extend netcdf library combo test to include just -lnetcdff # Extend netcdf library combo test to include just -lnetcdff
postPatch = '' postPatch = ''
patchShebangs build patchShebangs build
sed -i -e 's/in "" -lnetcdf "-lnetcdff -lnetcdf";/in "" -lnetcdf "-lnetcdff -lnetcdf" -lnetcdff;/' configure sed -i -e 's/in "" -lnetcdf "-lnetcdff -lnetcdf";/in "" -lnetcdf "-lnetcdff -lnetcdf" -lnetcdff;/' m4/netcdf.m4
''; '';
configureFlags = [ configureFlags = [
@@ -59,5 +61,5 @@ let
}; };
in { in {
octopus72 = common "7.2" "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m"; octopus72 = common "7.2" "04r826vj7sps3pnwkn8axh4jkiqwddy96lbr3ly4x6ph9c9xmvrq";
} }