diff options
| author | Gunnar Nitsche <broke@in-fucking.space> | 2021-12-26 15:16:06 +0100 |
|---|---|---|
| committer | Gunnar Nitsche <broke@in-fucking.space> | 2021-12-26 20:29:41 +0100 |
| commit | cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4 (patch) | |
| tree | 4b66ffe9a902e788259f1718b9e2b58d054aa42c /pkgs/applications/science/physics | |
| parent | 7e9eb10b798a264bafd57989828deb4084c8b750 (diff) | |
| download | nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar.gz nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar.bz2 nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar.lz nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar.xz nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.tar.zst nixpkgs-cc690c83f43c155e4046c5bc3b4b8cd6eb7d08b4.zip | |
elmerfem: 8.4 -> 9.0
Diffstat (limited to 'pkgs/applications/science/physics')
| -rw-r--r-- | pkgs/applications/science/physics/elmerfem/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/applications/science/physics/elmerfem/fix-cmake.patch | 13 |
2 files changed, 3 insertions, 20 deletions
diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index cd9b7430b99..63dfe6c2837 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 098f6520733..00000000000 --- 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}) |