From cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4 Mon Sep 17 00:00:00 2001
From: Gunnar Nitsche <broke@in-fucking.space>
Date: Sun, 26 Dec 2021 15:16:06 +0100
Subject: elmerfem: 8.4 -> 9.0

---
 pkgs/applications/science/physics/elmerfem/default.nix     | 10 +++-------
 pkgs/applications/science/physics/elmerfem/fix-cmake.patch | 13 -------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/science/physics/elmerfem/fix-cmake.patch

(limited to 'pkgs/applications/science/physics')

diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix
index cd9b7430b99f..63dfe6c28373 100644
--- a/pkgs/applications/science/physics/elmerfem/default.nix
+++ b/pkgs/applications/science/physics/elmerfem/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elmerfem";
-  version = "8.4";
+  version = "9.0";
 
   src = fetchFromGitHub {
     owner = "elmercsc";
     repo = "elmerfem";
     rev = "release-${version}";
-    sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm";
+    sha256 = "VK7jvu4s5d7k0c39XqY9dEzg/vXtX5Yr/09VcuZVQ9A=";
   };
 
   hardeningDisable = [ "format" ];
@@ -32,15 +32,11 @@ stdenv.mkDerivation rec {
   "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND"
   ];
 
-  patches = [
-    ./fix-cmake.patch
-  ];
-
   meta = with lib; {
     homepage = "https://elmerfem.org/";
     description = "A finite element software for multiphysical problems";
     platforms = platforms.unix;
-    maintainers = [ maintainers.wulfsta ];
+    maintainers = with maintainers; [ wulfsta broke ];
     license = licenses.lgpl21;
   };
 
diff --git a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch
deleted file mode 100644
index 098f65207330..000000000000
--- a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt
---- A/fem/tests/CMakeLists.txt	2020-04-23 02:35:03.243388917 -0400
-+++ B/fem/tests/CMakeLists.txt	2018-12-19 20:18:40.671857320 -0400
-@@ -14,7 +14,7 @@ 
- SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D")
-
- MACRO(SUBDIRLIST result curdir depth)
-   set(glob_pattern "*")
--  FOREACH(D RANGE 1 depth)
-+  FOREACH(D RANGE 1 ${depth})
-     FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) 
-     FOREACH(child ${children})
-       IF(IS_DIRECTORY ${curdir}/${child})
-- 
cgit 1.4.1