ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95999 from gebner/calculix217

Browse Source 
calculix: 2.15 -> 2.17
This commit is contained in:
Gabriel Ebner 2020-08-22 18:26:02 +02:00 committed by GitHub
commit 55af730da0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/science/math/calculix/calculix.patch
View File

@ -1,16 +1,7 @@
diff --git a/ccx_2.15/src/Makefile b/ccx_2.15/src/Makefile diff -Naur a/ccx_2.17/src/Makefile b/ccx_2.17/src/Makefile
index 9cab2fc..6e977b8 100755 --- a/ccx_2.17/src/Makefile 2020-07-23 21:41:38.507761972 +0200
--- a/ccx_2.15/src/Makefile +++ b/ccx_2.17/src/Makefile 2020-08-22 16:53:50.004938281 +0200
+++ b/ccx_2.15/src/Makefile @@ -18,15 +18,10 @@
@@ -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)
OCCXC = $(SCCXC:.c=.o) OCCXC = $(SCCXC:.c=.o)
OCCXMAIN = $(SCCXMAIN:.c=.o) OCCXMAIN = $(SCCXMAIN:.c=.o)
@ -22,10 +13,10 @@ index 9cab2fc..6e977b8 100755
- ../../../ARPACK/libarpack_INTEL.a \ - ../../../ARPACK/libarpack_INTEL.a \
- -lpthread -lm -lc - -lpthread -lm -lc
- -
-ccx_2.15: $(OCCXMAIN) ccx_2.15.a $(LIBS) -ccx_2.17: $(OCCXMAIN) ccx_2.17.a $(LIBS)
- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.17.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.17.a $(LIBS)
+ccx_2.15: $(OCCXMAIN) ccx_2.15.a +ccx_2.17: $(OCCXMAIN) ccx_2.17.a
+ $(CC) $(CFLAGS) -c ccx_2.15.c; $(FC) -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.15.a $(LIBS) + $(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 $@ $? ar vr $@ $?

4
pkgs/applications/science/math/calculix/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "calculix"; pname = "calculix";
version = "2.15"; version = "2.17";
src = fetchurl { src = fetchurl {
url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2";
sha256 = "0d4axfxgm3ag4p2vx9rjcky7c122k99a2nhv1jv53brm35rblzdw"; sha256 = "0l3fizxfdj2mpdp62wnk9v47q2yc3cy39fpsm629z7bjmba8lw6a";
}; };
nativeBuildInputs = [ gfortran ]; nativeBuildInputs = [ gfortran ];