diff --git a/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch new file mode 100644 index 000000000000..add650e1798b --- /dev/null +++ b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch @@ -0,0 +1,21 @@ +--- old/ccx_2.22/src/Makefile 2024-08-06 01:13:21.031704000 +0800 ++++ new/ccx_2.22/src/Makefile 2024-12-19 00:27:06.848862592 +0800 +@@ -18,15 +18,10 @@ + OCCXC = $(SCCXC:.c=.o) + OCCXMAIN = $(SCCXMAIN:.c=.o) + +-DIR=../../../SPOOLES.2.2 ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack + +-LIBS = \ +- $(DIR)/spooles.a \ +- ../../../ARPACK/libarpack_INTEL.a \ +- -lpthread -lm -lc +- +-ccx_2.22: $(OCCXMAIN) ccx_2.22.a $(LIBS) +- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp ++ccx_2.22: $(OCCXMAIN) ccx_2.22.a ++ $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp + + ccx_2.22.a: $(OCCXF) $(OCCXC) + ar vr $@ $? diff --git a/pkgs/by-name/ca/calculix/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix similarity index 66% rename from pkgs/by-name/ca/calculix/package.nix rename to pkgs/by-name/ca/calculix-ccx/package.nix index aae214513391..9afb29e17e42 100644 --- a/pkgs/by-name/ca/calculix/package.nix +++ b/pkgs/by-name/ca/calculix-ccx/package.nix @@ -12,12 +12,12 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); stdenv.mkDerivation rec { - pname = "calculix"; - version = "2.19"; + pname = "calculix-ccx"; + version = "2.22"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7"; + hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw="; }; nativeBuildInputs = [ gfortran ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; patches = [ - ./calculix.patch + ./calculix-ccx.patch ]; postPatch = '' @@ -43,15 +43,19 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + install -Dm0755 ccx_${version} $out/bin/ccx + + runHook postInstall ''; - meta = with lib; { - homepage = "http://www.calculix.de/"; + meta = { + homepage = "http://www.calculix.de"; description = "Three-dimensional structural finite element program"; mainProgram = "ccx"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ gebner ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ gebner ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ca/calculix/calculix.patch b/pkgs/by-name/ca/calculix/calculix.patch deleted file mode 100644 index 36048546948c..000000000000 --- a/pkgs/by-name/ca/calculix/calculix.patch +++ /dev/null @@ -1,23 +0,0 @@ -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) - --DIR=../../../SPOOLES.2.2 -+LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack - --LIBS = \ -- $(DIR)/spooles.a \ -- ../../../ARPACK/libarpack_INTEL.a \ -- -lpthread -lm -lc -- --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.19.a: $(OCCXF) $(OCCXC) - ar vr $@ $? diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a03cf8b58761..46fb6da427e8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -186,6 +186,7 @@ mapAliases { ### C ### caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 + calculix = calculix-ccx; # Added 2024-12-18 calligra = kdePackages.calligra; # Added 2024-09-27 callPackage_i686 = pkgsi686Linux.callPackage; cask = emacs.pkgs.cask; # Added 2022-11-12