88 lines
3.4 KiB
Diff
88 lines
3.4 KiB
Diff
From 94f1225197c156725f8d218416e4471462b71010 Mon Sep 17 00:00:00 2001
|
|
From: Gabriel Ebner <gebner@gebner.org>
|
|
Date: Mon, 25 Apr 2022 12:51:12 +0200
|
|
Subject: [PATCH 1/2] calculix: fix build with gfortran 10
|
|
|
|
---
|
|
pkgs/applications/science/math/calculix/default.nix | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix
|
|
index e9766b32c2a48..44721c560b896 100644
|
|
--- a/pkgs/applications/science/math/calculix/default.nix
|
|
+++ b/pkgs/applications/science/math/calculix/default.nix
|
|
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
|
|
|
|
buildInputs = [ arpack spooles blas lapack ];
|
|
|
|
- NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles";
|
|
+ NIX_CFLAGS_COMPILE = [
|
|
+ "-I${spooles}/include/spooles"
|
|
+ "-std=legacy"
|
|
+ ];
|
|
|
|
patches = [
|
|
./calculix.patch
|
|
|
|
From 5838726cb99855821d1f465d90a2f9aa9d716750 Mon Sep 17 00:00:00 2001
|
|
From: Gabriel Ebner <gebner@gebner.org>
|
|
Date: Mon, 25 Apr 2022 12:56:36 +0200
|
|
Subject: [PATCH 2/2] calculix: 2.17 -> 2.19
|
|
|
|
---
|
|
.../science/math/calculix/calculix.patch | 19 ++++++++++---------
|
|
.../science/math/calculix/default.nix | 4 ++--
|
|
2 files changed, 12 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch
|
|
index 2334d54711e5a..36048546948c5 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 44721c560b896..df943277a627e 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 ];
|