diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2020-08-22 18:26:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 18:26:02 +0200 |
| commit | 55af730da06d28f693e963d0b3a098eade3b9471 (patch) | |
| tree | f6a4f5566d95636280102fd6da95c5c3a66f03b3 /pkgs/applications/science | |
| parent | b679e8d070d6b6adf95e75652ae1231ed4733358 (diff) | |
| parent | 214d7626e10b983b32e873069a6ce202f5cf5daa (diff) | |
Merge pull request #95999 from gebner/calculix217
calculix: 2.15 -> 2.17
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/calculix/calculix.patch | 27 | ||||
| -rw-r--r-- | pkgs/applications/science/math/calculix/default.nix | 4 |
2 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 5b8f492a8e7c7..2334d54711e5a 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -1,16 +1,7 @@ -diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile -index 9cab2fc..6e977b8 100755 ---- a/ccx_2.15/src/Makefile -+++ b/ccx_2.15/src/Makefile -@@ -1,6 +1,6 @@ - - CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT --FFLAGS = -Wall -O3 -+FFLAGS = -Wall -O3 - - CC=cc - FC=gfortran -@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) +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 @@ OCCXC = $(SCCXC:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o) @@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755 - ../../../ARPACK/libarpack_INTEL.a \ - -lpthread -lm -lc - --ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) -- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) -+ccx_2.15: $(OCCXMAIN) ccx_2.15.a -+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) +-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.15.a: $(OCCXF) $(OCCXC) + ccx_2.17.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 44882594550b6..e37e9d0910c3a 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.15"; + version = "2.17"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; + sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a"; }; nativeBuildInputs = [ gfortran ]; |