diff --git a/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch index 36048546948c..add650e1798b 100644 --- a/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch +++ b/pkgs/by-name/ca/calculix-ccx/calculix-ccx.patch @@ -1,8 +1,6 @@ -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) +--- 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) @@ -14,10 +12,10 @@ index c503513..8a69a0c 100755 - ../../../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.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.19.a: $(OCCXF) $(OCCXC) + ccx_2.22.a: $(OCCXF) $(OCCXC) ar vr $@ $? diff --git a/pkgs/by-name/ca/calculix-ccx/package.nix b/pkgs/by-name/ca/calculix-ccx/package.nix index 49c58b86407a..9afb29e17e42 100644 --- a/pkgs/by-name/ca/calculix-ccx/package.nix +++ b/pkgs/by-name/ca/calculix-ccx/package.nix @@ -13,11 +13,11 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla stdenv.mkDerivation rec { pname = "calculix-ccx"; - version = "2.19"; + version = "2.22"; src = fetchurl { url = "http://www.dhondt.de/ccx_${version}.src.tar.bz2"; - sha256 = "01vdy9sns58hkm39z6d0r5y7gzqf5z493d18jin9krqib1l6jnn7"; + hash = "sha256-OpTcx3WjH1cCKXNLNB1rBjAevcdZhj35Aci5vxhUwLw="; }; nativeBuildInputs = [ gfortran ]; @@ -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; }; }