nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-24 21:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

calculix: 2.17 -> 2.19

Browse Source
This commit is contained in:
Gabriel Ebner 2022-04-25 12:56:36 +02:00
parent 94f1225197
commit 5838726cb9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 $@ $?

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

@ -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 ];