git.iko.soy/typeable/nixpkgs
on master help sign in
calculix: 2.15 -> 2.17
commit214d7626e10b983b32e873069a6ce202f5cf5daa authorGabriel Ebner <gebner@gebner.org> dateSat 22 Aug 2020, 17:12 (6 years ago) parent379348c
2 files changed+11−20
pkgs/applications/science/math/calculix/calculix.patch+9−18 pkgs/applications/science/math/calculix/default.nix+2−2
pkgs/applications/science/math/calculix/calculix.patch+9−18
@@ -1,16 +1,7 @@
1−diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile
2−index 9cab2fc..6e977b8 100755
3−--- a/ccx_2.15/src/Makefile
4−+++ b/ccx_2.15/src/Makefile
5−@@ -1,6 +1,6 @@
6−
7− CFLAGS = -Wall -O3 -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE -DNETWORKOUT
8−-FFLAGS = -Wall -O3
9−+FFLAGS = -Wall -O3
10−
11− CC=cc
12− FC=gfortran
13−@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
1+diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile
2+--- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200
3++++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200
4+@@ -18,15 +18,10 @@
145 OCCXC = $(SCCXC:.c=.o)
156 OCCXMAIN = $(SCCXMAIN:.c=.o)
167
@@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755
2213- ../../../ARPACK/libarpack_INTEL.a \
2314- -lpthread -lm -lc
2415-
25−-ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS)
26−- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS)
27−+ccx_2.15: $(OCCXMAIN) ccx_2.15.a
28−+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS)
16+-ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS)
17+- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
18++ccx_2.17: $(OCCXMAIN) ccx_2.17.a
19++ $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
2920
30− ccx_2.15.a: $(OCCXF) $(OCCXC)
21+ ccx_2.17.a: $(OCCXF) $(OCCXC)
3122 ar vr $@ $?
pkgs/applications/science/math/calculix/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "calculix";
5− version = "2.15";
5+ version = "2.17";
66
77 src = fetchurl {
88 url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2";
9− sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw";
9+ sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a";
1010 };
1111
1212 nativeBuildInputs = [ gfortran ];