From 2de67f8be5de0e25ddb2c2b0ab7aa2f50205da2d Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 17 Jul 2025 14:58:56 +0800 Subject: [PATCH] gmsh: 4.13.1 -> 4.14.0 changelog: https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_4_14_0#changelog --- pkgs/by-name/gm/gmsh/package.nix | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix index 098cf4e51eaf..c2b341e5f15e 100644 --- a/pkgs/by-name/gm/gmsh/package.nix +++ b/pkgs/by-name/gm/gmsh/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, makeDesktopItem, copyDesktopItems, cmake, @@ -26,11 +25,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation (finalAttrs: { pname = "gmsh"; - version = "4.13.1"; + version = "4.14.0"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz"; - hash = "sha256-d5chRfQxcmAm1QWWpqRPs8HJXCElUhjWaVWAa4btvo0="; + hash = "sha256-2019ogYumkNWqCCDITirmfl69jiL/rIVmaLq37C3aig="; }; nativeBuildInputs = [ @@ -66,18 +65,6 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - patches = [ - (fetchpatch { - url = "https://gitlab.onelab.info/gmsh/gmsh/-/commit/7d5094fb0a5245cb435afd3f3e8c35e2ecfe70fd.patch"; - hash = "sha256-3atm1NGsMI4KEct2xakRG6EasRpF6YRI4raoVYxBV4g="; - }) - ]; - - postPatch = '' - substituteInPlace api/gmsh.py \ - --replace-fail 'find_library("gmsh")' \"$out/lib/libgmsh${stdenv.hostPlatform.extensions.sharedLibrary}\" - ''; - # N.B. the shared object is used by bindings cmakeFlags = [ "-DENABLE_BUILD_SHARED=ON" @@ -124,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Three-dimensional finite element mesh generator"; mainProgram = "gmsh"; homepage = "https://gmsh.info/"; + changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog"; license = lib.licenses.gpl2Plus; }; })