diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-09-24 00:02:23 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-24 00:02:23 +0000 |
commit | 0e6413dbff4a5cd6d29e9f2bf349d3aefe89990b (patch) | |
tree | 3217d639d7832d6cfd2d3ef43c125441e8284528 /pkgs/applications/science | |
parent | ab2ecc25c1a4f0a029e6a1c2152fb18d5a9505d1 (diff) | |
parent | 74970765262f0958d124b5b43afdd45e8285d527 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/physics/elmerfem/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix index 41a0e00ae7845..e63203a93f285 100644 --- a/pkgs/applications/science/physics/elmerfem/default.nix +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade-occt, libsForQt5, tbb, vtkWithQt5 }: stdenv.mkDerivation rec { pname = "elmerfem"; - version = "unstable-2023-02-03"; + version = "unstable-2023-09-18"; src = fetchFromGitHub { owner = "elmercsc"; repo = pname; - rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343"; - hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug="; + rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c"; + hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc="; }; hardeningDisable = [ "format" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libsForQt5.qwt libGL libGLU - opencascade + opencascade-occt tbb vtkWithQt5 ]; |