pyrox.dev / nixpkgs
lol
fork atom

calculix-ccx: 2.19 -> 2.22 (#366221)

authored by

Thiago Kenji Okada and committed by
GitHub 79ef99a0 a37e7edc

+35 -32
+21
pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch
··· 1 + --- old/ccx_2.22/src/Makefile 2024-08-06 01:13:21.031704000 +0800 2 + +++ new/ccx_2.22/src/Makefile 2024-12-19 00:27:06.848862592 +0800 3 + @@ -18,15 +18,10 @@ 4 + OCCXC = $(SCCXC:.c=.o) 5 + OCCXMAIN = $(SCCXMAIN:.c=.o) 6 + 7 + -DIR=../../../SPOOLES.2.2 8 + +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack 9 + 10 + -LIBS = \ 11 + - $(DIR)/spooles.a \ 12 + - ../../../ARPACK/libarpack_INTEL.a \ 13 + - -lpthread -lm -lc 14 + - 15 + -ccx_2.22: $(OCCXMAIN) ccx_2.22.a $(LIBS) 16 + - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp 17 + +ccx_2.22: $(OCCXMAIN) ccx_2.22.a 18 + + $(CC) $(CFLAGS) -c ccx_2.22.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.22.a $(LIBS) -fopenmp 19 + 20 + ccx_2.22.a: $(OCCXF) $(OCCXC) 21 + ar vr $@ $?
-23
pkgs/by-name/ca/calculix/calculix.patch
··· 1 - diff --git a/ccx_2.19/src/Makefile b/ccx_2.19/src/Makefile 2 - index c503513..8a69a0c 100755 3 - --- a/ccx_2.19/src/Makefile 4 - +++ b/ccx_2.19/src/Makefile 5 - @@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o) 6 - OCCXC = $(SCCXC:.c=.o) 7 - OCCXMAIN = $(SCCXMAIN:.c=.o) 8 - 9 - -DIR=../../../SPOOLES.2.2 10 - +LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack 11 - 12 - -LIBS = \ 13 - - $(DIR)/spooles.a \ 14 - - ../../../ARPACK/libarpack_INTEL.a \ 15 - - -lpthread -lm -lc 16 - - 17 - -ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS) 18 - - ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp 19 - +ccx_2.19: $(OCCXMAIN) ccx_2.19.a 20 - + $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp 21 - 22 - ccx_2.19.a: $(OCCXF) $(OCCXC) 23 - ar vr $@ $?
+13 -9
pkgs/by-name/ca/calculix/package.nix pkgs/by-name/ca/calculix-ccx/package.nix
··· 12 12 assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64); 13 13 14 14 stdenv.mkDerivation rec { 15 - pname = "calculix"; 16 - version = "2.19"; 15 + pname = "calculix-ccx"; 16 + version = "2.22"; 17 17 18 18 src = fetchurl { 19 19 url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; 20 - sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7"; 20 + hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw="; 21 21 }; 22 22 23 23 nativeBuildInputs = [ gfortran ]; ··· 35 35 ]; 36 36 37 37 patches = [ 38 - ./calculix.patch 38 + ./calculix-ccx.patch 39 39 ]; 40 40 41 41 postPatch = '' ··· 43 43 ''; 44 44 45 45 installPhase = '' 46 + runHook preInstall 47 + 46 48 install -Dm0755 ccx_${version} $out/bin/ccx 49 + 50 + runHook postInstall 47 51 ''; 48 52 49 - meta = with lib; { 50 - homepage = "http://www.calculix.de/"; 53 + meta = { 54 + homepage = "http://www.calculix.de"; 51 55 description = "Three-dimensional structural finite element program"; 52 56 mainProgram = "ccx"; 53 - license = licenses.gpl2Plus; 54 - maintainers = with maintainers; [ gebner ]; 55 - platforms = platforms.unix; 57 + license = lib.licenses.gpl2Plus; 58 + maintainers = with lib.maintainers; [ gebner ]; 59 + platforms = lib.platforms.unix; 56 60 }; 57 61 }
+1
pkgs/top-level/aliases.nix
··· 186 186 ### C ### 187 187 188 188 caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20 189 + calculix = calculix-ccx; # Added 2024-12-18 189 190 calligra = kdePackages.calligra; # Added 2024-09-27 190 191 callPackage_i686 = pkgsi686Linux.callPackage; 191 192 cask = emacs.pkgs.cask; # Added 2022-11-12