diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 2334d54711e5..36048546948c 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -1,7 +1,8 @@ -diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile ---- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200 -+++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200 -@@ -18,15 +18,10 @@ +diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile +index c503513..8a69a0c 100755 +--- a/ccx_2.19/src/Makefile ++++ b/ccx_2.19/src/Makefile +@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -13,10 +14,10 @@ diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) -+ccx_2.17: $(OCCXMAIN) ccx_2.17.a -+ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS) +-ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp ++ccx_2.19: $(OCCXMAIN) ccx_2.19.a ++ $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp - ccx_2.17.a: $(OCCXF) $(OCCXC) + ccx_2.19.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 44721c560b89..df943277a627 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calculix"; - version = "2.17"; + version = "2.19"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; + sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7"; }; nativeBuildInputs = [ gfortran ];