From ab44c335e01af55612b5d70caef5b66cc23955a9 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 2 Aug 2024 21:21:54 +0100 Subject: [PATCH 1/7] febio: move to `pkgs/by-name` --- .../{development/libraries => by-name/fe}/febio/fix-cmake.patch | 0 .../febio/default.nix => by-name/fe/febio/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/libraries => by-name/fe}/febio/fix-cmake.patch (100%) rename pkgs/{development/libraries/febio/default.nix => by-name/fe/febio/package.nix} (100%) diff --git a/pkgs/development/libraries/febio/fix-cmake.patch b/pkgs/by-name/fe/febio/fix-cmake.patch similarity index 100% rename from pkgs/development/libraries/febio/fix-cmake.patch rename to pkgs/by-name/fe/febio/fix-cmake.patch diff --git a/pkgs/development/libraries/febio/default.nix b/pkgs/by-name/fe/febio/package.nix similarity index 100% rename from pkgs/development/libraries/febio/default.nix rename to pkgs/by-name/fe/febio/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6a87b68828c0..141c40411ef7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20249,8 +20249,6 @@ with pkgs; fcl = callPackage ../development/libraries/fcl { }; - febio = callPackage ../development/libraries/febio { }; - ffcast = callPackage ../tools/X11/ffcast { }; fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; From f832d1cd9c4124e2893329ddf364b8e66d7c6150 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 2 Aug 2024 21:22:32 +0100 Subject: [PATCH 2/7] febio: format with `nixfmt-rfc-style` --- pkgs/by-name/fe/febio/package.nix | 33 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index d0c54b8b157d..4e37ebd76495 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, eigen, libxml2, mpi, python3 -, mklSupport ? true, mkl -, substituteAll +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + boost, + eigen, + libxml2, + mpi, + python3, + mklSupport ? true, + mkl, + substituteAll, }: stdenv.mkDerivation rec { @@ -16,14 +26,12 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { - src = ./fix-cmake.patch; # cannot find mkl libraries without this + src = ./fix-cmake.patch; # cannot find mkl libraries without this so = stdenv.hostPlatform.extensions.sharedLibrary; }) ]; - cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" - ++ lib.optional mklSupport "-DMKLROOT=${mkl}" - ; + cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" ++ lib.optional mklSupport "-DMKLROOT=${mkl}"; env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring"; @@ -47,9 +55,14 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost eigen libxml2 mpi python3 python3.pkgs.numpy ] - ++ lib.optional mklSupport mkl - ; + buildInputs = [ + boost + eigen + libxml2 + mpi + python3 + python3.pkgs.numpy + ] ++ lib.optional mklSupport mkl; meta = { description = "FEBio Suite Solver"; From 64435f505fa3a08a048e5232afc04d54139cae05 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 13:58:10 +0100 Subject: [PATCH 3/7] febio: 3.6 -> 4.7 --- pkgs/by-name/fe/febio/fix-cmake.patch | 77 +++++++++++++++++++----- pkgs/by-name/fe/febio/package.nix | 84 +++++++++++++-------------- 2 files changed, 102 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/fe/febio/fix-cmake.patch b/pkgs/by-name/fe/febio/fix-cmake.patch index 456179ca8364..f3c0ddbd9409 100644 --- a/pkgs/by-name/fe/febio/fix-cmake.patch +++ b/pkgs/by-name/fe/febio/fix-cmake.patch @@ -1,6 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1bc953edf..f6aaf92fb5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -47,7 +47,7 @@ function(findLib libName libDir libOut) +@@ -2,6 +2,7 @@ + set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + mark_as_advanced(FORCE CMAKE_INSTALL_PREFIX) ++include(GNUInstallDirs) + + project(FEBio) + set(FEBIO_LIBS FEBioFluid FEBioLib FEBioMech FEBioMix FEBioOpt FECore NumCore FEAMR FEBioRVE FEImgLib) +@@ -51,7 +52,7 @@ find_library(TEMP NAMES ${libName}.lib ${ARGV3}.lib ${ARGV4}.lib ${ARGV5}.lib ${ARGV6}.lib PATHS ${${libDir}} NO_DEFAULT_PATH) else() @@ -9,18 +19,53 @@ PATHS ${${libDir}} NO_DEFAULT_PATH) endif() -diff --git a/FindDependencies.cmake b/FindDependencies.cmake -index 2d644005f..7261ba923 100644 ---- a/FindDependencies.cmake -+++ b/FindDependencies.cmake -@@ -46,8 +46,8 @@ if(MKLROOT) - NO_DEFAULT_PATH) - - find_library(MKL_OMP_LIB -- NAMES iomp5 iomp5md libiomp5md.lib -- PATHS ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib -+ NAMES libiomp5@so@ libiomp5 iomp5 iomp5md libiomp5md.lib -+ PATHS ${MKLROOT}/lib ${MKLROOT}/../lib ${MKLROOT}/../compiler/lib - PATH_SUFFIXES "intel64" "intel32" - NO_DEFAULT_PATH - DOC "MKL OMP Library") +@@ -154,7 +155,7 @@ + ##### Find Source Files ##### + + macro(findHdrSrc name) +- file(GLOB HDR_${name} "${name}/*.h") ++ file(GLOB HDR_${name} "${name}/*.h" "${name}/*.hpp") + file(GLOB SRC_${name} "${name}/*.cpp") + endmacro() + +@@ -171,8 +172,9 @@ + + macro(addLib name TYPE) + string(TOLOWER ${name} lname) +- add_library(${lname} ${TYPE} ${HDR_${name}} ${SRC_${name}}) ++ add_library(${lname} ${TYPE} ${SRC_${name}}) + set_property(TARGET ${lname} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/${name}_autogen) ++ target_sources(${lname} PUBLIC FILE_SET HEADERS TYPE HEADERS FILES ${HDR_${name}}) + + if(NOT WIN32) + set_property(TARGET ${lname} PROPERTY POSITION_INDEPENDENT_CODE ON) +@@ -181,6 +183,8 @@ + if(APPLE) + target_link_libraries(${lname} PRIVATE "-undefined dynamic_lookup") + endif() ++ ++ install(TARGETS ${lname} FILE_SET HEADERS) + endmacro() + + foreach(name IN LISTS FEBIO_LIBS) +@@ -194,6 +198,7 @@ + ##### Set up executable compilation ##### + file(GLOB SOURCES "FEBio/*.cpp") + add_executable (febio4 ${SOURCES}) ++install(TARGETS febio4) + + if(WIN32) + target_compile_options(febio4 PRIVATE /openmp) +@@ -269,7 +274,6 @@ + mark_as_advanced(EXTRA_INC) + + ##### Setup includes, defnitions, and linking options ##### +-include_directories(${PROJECT_SOURCE_DIR}) + + # Link LEVMAR + if(USE_LEVMAR) +@@ -438,3 +442,4 @@ + file(WRITE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/febio.xml "${filedata}") + endif() + ++install(FILES ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/febio.xml TYPE BIN) diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index 4e37ebd76495..01897ae76036 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -1,68 +1,66 @@ { lib, stdenv, + overrideSDK, fetchFromGitHub, + fetchpatch2, + substituteAll, cmake, - boost, - eigen, - libxml2, - mpi, - python3, + ninja, + zlib, + darwin, mklSupport ? true, mkl, - substituteAll, }: -stdenv.mkDerivation rec { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in + +stdenv'.mkDerivation (finalAttrs: { pname = "FEBio"; - version = "3.6"; + version = "4.7"; src = fetchFromGitHub { owner = "febiosoftware"; - repo = pname; - rev = "v${version}"; - sha256 = "187s4lyzr806xla3smq3lsvj3f6wxlhfkban89w0fnyfmfb8w9am"; + repo = "FEBio"; + rev = "v${finalAttrs.version}"; + hash = "sha256-RRdIOyXg4jYW76ABfJdMfVtCYMLYFdvyOI98nHXCof8="; }; patches = [ + # Fix library searching and installation (substituteAll { - src = ./fix-cmake.patch; # cannot find mkl libraries without this + src = ./fix-cmake.patch; so = stdenv.hostPlatform.extensions.sharedLibrary; }) + + # Fixed missing header include for strcpy + # https://github.com/febiosoftware/FEBio/pull/92 + (fetchpatch2 { + url = "https://github.com/febiosoftware/FEBio/commit/ad9e80e2aa8737828855458a703822f578db2fd3.patch?full_index=1"; + hash = "sha256-/uLnJB/oAwLQnsZtJnUlaAEpyZVLG6o2riRwwMCH8rI="; + }) ]; - cmakeFlags = lib.optional mklSupport "-DUSE_MKL=On" ++ lib.optional mklSupport "-DMKLROOT=${mkl}"; + cmakeFlags = lib.optionals mklSupport [ + (lib.cmakeBool "USE_MKL" true) + (lib.cmakeFeature "MKLROOT" "${mkl}") + ]; - env.CXXFLAGS = lib.optionalString stdenv.isLinux "-include cstring"; + nativeBuildInputs = [ + cmake + ninja + ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/include - cp -R lib bin $out/ - cp -R ../FECore \ - ../FEBioFluid \ - ../FEBioLib \ - ../FEBioMech \ - ../FEBioMix \ - ../FEBioOpt \ - ../FEBioPlot \ - ../FEBioXML \ - ../NumCore \ - $out/include - - runHook postInstall - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - boost - eigen - libxml2 - mpi - python3 - python3.pkgs.numpy - ] ++ lib.optional mklSupport mkl; + buildInputs = + [ zlib ] + ++ lib.optionals mklSupport [ mkl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.CoreVideo + darwin.apple_sdk.frameworks.Accelerate + ]; meta = { description = "FEBio Suite Solver"; @@ -71,4 +69,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ Scriptkiddi ]; }; -} +}) From b680e6f51d29bffda276edb2831c92b13767834c Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 2 Aug 2024 21:56:40 +0100 Subject: [PATCH 4/7] tetgen: enable on all unix platforms --- pkgs/applications/science/geometry/tetgen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index dce56dc4e17d..e64941f4243a 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { mainProgram = "tetgen"; homepage = "http://tetgen.org/"; license = lib.licenses.agpl3Plus; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } From c0f739e784252b7e1b57ce88987c31f72690dacf Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 17:00:06 +0100 Subject: [PATCH 5/7] febio-studio: format with `nixfmt-rfc-style` --- .../science/biology/febio-studio/default.nix | 59 +++++++++++++------ 1 file changed, 40 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/applications/science/biology/febio-studio/default.nix index 708bd0f4305a..66618cc08e10 100644 --- a/pkgs/applications/science/biology/febio-studio/default.nix +++ b/pkgs/applications/science/biology/febio-studio/default.nix @@ -1,10 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook -, sshSupport ? true, openssl, libssh -, tetgenSupport ? true, tetgen -, ffmpegSupport ? true, ffmpeg_4 -, dicomSupport ? false, dcmtk -, withModelRepo ? true -, withCadFeatures ? false +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + zlib, + libglvnd, + libGLU, + wrapQtAppsHook, + sshSupport ? true, + openssl, + libssh, + tetgenSupport ? true, + tetgen, + ffmpegSupport ? true, + ffmpeg_4, + dicomSupport ? false, + dcmtk, + withModelRepo ? true, + withCadFeatures ? false, }: stdenv.mkDerivation rec { @@ -22,19 +35,18 @@ stdenv.mkDerivation rec { ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags ]; - cmakeFlags = [ - "-DQt_Ver=5" - "-DNOT_FIRST=On" - "-DOpenGL_GL_PREFERENCE=GLVND" - ] + cmakeFlags = + [ + "-DQt_Ver=5" + "-DNOT_FIRST=On" + "-DOpenGL_GL_PREFERENCE=GLVND" + ] ++ lib.optional sshSupport "-DUSE_SSH=On" ++ lib.optional tetgenSupport "-DUSE_TETGEN=On" ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On" ++ lib.optional dicomSupport "-DUSE_DICOM=On" ++ lib.optional withModelRepo "-DMODEL_REPO=On" - ++ lib.optional withCadFeatures "-DCAD_FEATURES=On" - ; - + ++ lib.optional withCadFeatures "-DCAD_FEATURES=On"; installPhase = '' runHook preInstall @@ -43,13 +55,22 @@ stdenv.mkDerivation rec { runHook postInstall ''; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ zlib libglvnd libGLU openssl libssh ] + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + buildInputs = + [ + zlib + libglvnd + libGLU + openssl + libssh + ] ++ lib.optional sshSupport openssl ++ lib.optional tetgenSupport tetgen ++ lib.optional ffmpegSupport ffmpeg_4 - ++ lib.optional dicomSupport dcmtk - ; + ++ lib.optional dicomSupport dcmtk; meta = with lib; { description = "FEBio Suite Solver"; From a600cdfb4aad0c631d43ed4b0456434fb22e1b78 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 21 Jul 2024 13:58:10 +0100 Subject: [PATCH 6/7] febio-studio: 1.6.1 -> 2.7 --- .../biology/febio-studio/cmake-install.patch | 14 ++++ .../science/biology/febio-studio/default.nix | 68 ++++++++++--------- .../febio-studio/febio-studio-cmake.patch | 38 ----------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 52 insertions(+), 70 deletions(-) create mode 100644 pkgs/applications/science/biology/febio-studio/cmake-install.patch delete mode 100644 pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch diff --git a/pkgs/applications/science/biology/febio-studio/cmake-install.patch b/pkgs/applications/science/biology/febio-studio/cmake-install.patch new file mode 100644 index 000000000000..cf7dbf3c031e --- /dev/null +++ b/pkgs/applications/science/biology/febio-studio/cmake-install.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7ad2c68eb2..0e3e978bd9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -449,6 +449,9 @@ + set_property(TARGET ${FBS_BIN_NAME} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/FEBioStudio_autogen) + endif() + ++include(GNUInstallDirs) ++install(TARGETS ${FBS_BIN_NAME} BUNDLE DESTINATION Applications) ++ + macro(addLib name) + add_library(${name} ${HDR_${name}} ${SRC_${name}}) + set_property(TARGET ${name} PROPERTY AUTOGEN_BUILD_DIR ${CMAKE_BINARY_DIR}/CMakeFiles/AutoGen/${name}_autogen) diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/applications/science/biology/febio-studio/default.nix index 66618cc08e10..654046067dc8 100644 --- a/pkgs/applications/science/biology/febio-studio/default.nix +++ b/pkgs/applications/science/biology/febio-studio/default.nix @@ -1,46 +1,54 @@ { lib, stdenv, + overrideSDK, fetchFromGitHub, cmake, + ninja, zlib, - libglvnd, libGLU, - wrapQtAppsHook, + qt6Packages, + febio, + glew, sshSupport ? true, openssl, libssh, tetgenSupport ? true, tetgen, ffmpegSupport ? true, - ffmpeg_4, + ffmpeg_7, dicomSupport ? false, dcmtk, withModelRepo ? true, withCadFeatures ? false, }: -stdenv.mkDerivation rec { +let + stdenv' = + if stdenv.isDarwin then + overrideSDK stdenv { + darwinSdkVersion = "11.0"; + darwinMinVersion = "10.15"; + } + else + stdenv; +in + +stdenv'.mkDerivation (finalAttrs: { pname = "febio-studio"; - version = "1.6.1"; + version = "2.7"; src = fetchFromGitHub { owner = "febiosoftware"; repo = "FEBioStudio"; - rev = "v${version}"; - sha256 = "0r6pg49i0q9idp7pjymj7mlxd63qjvmfvg0l7fmx87y1yd2hfw4h"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ggIzz6bvNjqlI8s31EVnbM0TOspBSc9/myKpWukS3MU="; }; - patches = [ - ./febio-studio-cmake.patch # Fix Errors that appear with certain Cmake flags - ]; + patches = [ ./cmake-install.patch ]; cmakeFlags = - [ - "-DQt_Ver=5" - "-DNOT_FIRST=On" - "-DOpenGL_GL_PREFERENCE=GLVND" - ] + [ (lib.cmakeFeature "Qt_Root" "${qt6Packages.qtbase}") ] ++ lib.optional sshSupport "-DUSE_SSH=On" ++ lib.optional tetgenSupport "-DUSE_TETGEN=On" ++ lib.optional ffmpegSupport "-DUSE_FFMPEG=On" @@ -48,36 +56,34 @@ stdenv.mkDerivation rec { ++ lib.optional withModelRepo "-DMODEL_REPO=On" ++ lib.optional withCadFeatures "-DCAD_FEATURES=On"; - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -R bin $out/ - runHook postInstall - ''; - nativeBuildInputs = [ cmake - wrapQtAppsHook + ninja + qt6Packages.wrapQtAppsHook ]; + buildInputs = [ zlib - libglvnd libGLU + glew + qt6Packages.qtbase + febio + ] + ++ lib.optionals sshSupport [ openssl libssh ] - ++ lib.optional sshSupport openssl ++ lib.optional tetgenSupport tetgen - ++ lib.optional ffmpegSupport ffmpeg_4 + ++ lib.optional ffmpegSupport ffmpeg_7 ++ lib.optional dicomSupport dcmtk; - meta = with lib; { + meta = { description = "FEBio Suite Solver"; mainProgram = "FEBioStudio"; - license = with licenses; [ mit ]; + license = with lib.licenses; [ mit ]; homepage = "https://febio.org/"; - platforms = platforms.unix; - maintainers = with maintainers; [ Scriptkiddi ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ Scriptkiddi ]; }; -} +}) diff --git a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch b/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch deleted file mode 100644 index e694f6c3b89f..000000000000 --- a/pkgs/applications/science/biology/febio-studio/febio-studio-cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/FEBioStudio/RepositoryPanel.cpp b/FEBioStudio/RepositoryPanel.cpp -index 382db303..314cdc68 100644 ---- a/FEBioStudio/RepositoryPanel.cpp -+++ b/FEBioStudio/RepositoryPanel.cpp -@@ -1364,10 +1364,10 @@ void CRepositoryPanel::loadingPageProgress(qint64 bytesSent, qint64 bytesTotal) - - #else - --CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QWidget* parent){} -+CRepositoryPanel::CRepositoryPanel(CMainWindow* pwnd, QDockWidget* parent){} - CRepositoryPanel::~CRepositoryPanel(){} - void CRepositoryPanel::OpenLink(const QString& link) {} --// void CRepositoryPanel::Raise() {} -+void CRepositoryPanel::Raise() {} - void CRepositoryPanel::SetModelList(){} - void CRepositoryPanel::ShowMessage(QString message) {} - void CRepositoryPanel::ShowWelcomeMessage(QByteArray messages) {} -@@ -1396,6 +1396,7 @@ void CRepositoryPanel::on_actionSearch_triggered() {} - void CRepositoryPanel::on_actionClearSearch_triggered() {} - void CRepositoryPanel::on_actionDeleteRemote_triggered() {} - void CRepositoryPanel::on_actionModify_triggered() {} -+void CRepositoryPanel::on_actionCopyPermalink_triggered() {} - void CRepositoryPanel::on_treeWidget_itemSelectionChanged() {} - void CRepositoryPanel::on_treeWidget_customContextMenuRequested(const QPoint &pos) {} - void CRepositoryPanel::DownloadItem(CustomTreeWidgetItem *item) {} -diff --git a/FEBioStudio/WzdUpload.cpp b/FEBioStudio/WzdUpload.cpp -index 5ce74346..20062e06 100644 ---- a/FEBioStudio/WzdUpload.cpp -+++ b/FEBioStudio/WzdUpload.cpp -@@ -1183,7 +1183,7 @@ void CWzdUpload::on_saveJson_triggered() - getProjectJson(&projectInfo); - - QFile file(filedlg.selectedFiles()[0]); -- file.open(QIODeviceBase::WriteOnly); -+ file.open(QIODevice::WriteOnly); - file.write(projectInfo); - file.close(); - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 141c40411ef7..9b5edd0e6b65 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37181,7 +37181,7 @@ with pkgs; fastp = callPackage ../applications/science/biology/fastp { }; - febio-studio = libsForQt5.callPackage ../applications/science/biology/febio-studio { }; + febio-studio = callPackage ../applications/science/biology/febio-studio { }; flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { }; From aa4aae33c51735f558819b9d8d20188edf997768 Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 2 Aug 2024 21:53:03 +0100 Subject: [PATCH 7/7] febio-studio: move to `pkgs/by-name` --- .../biology => by-name/fe}/febio-studio/cmake-install.patch | 0 .../default.nix => by-name/fe/febio-studio/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/science/biology => by-name/fe}/febio-studio/cmake-install.patch (100%) rename pkgs/{applications/science/biology/febio-studio/default.nix => by-name/fe/febio-studio/package.nix} (100%) diff --git a/pkgs/applications/science/biology/febio-studio/cmake-install.patch b/pkgs/by-name/fe/febio-studio/cmake-install.patch similarity index 100% rename from pkgs/applications/science/biology/febio-studio/cmake-install.patch rename to pkgs/by-name/fe/febio-studio/cmake-install.patch diff --git a/pkgs/applications/science/biology/febio-studio/default.nix b/pkgs/by-name/fe/febio-studio/package.nix similarity index 100% rename from pkgs/applications/science/biology/febio-studio/default.nix rename to pkgs/by-name/fe/febio-studio/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5edd0e6b65..78b56dcc9861 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37181,8 +37181,6 @@ with pkgs; fastp = callPackage ../applications/science/biology/fastp { }; - febio-studio = callPackage ../applications/science/biology/febio-studio { }; - flywheel-cli = callPackage ../applications/science/biology/flywheel-cli { }; hh-suite = callPackage ../applications/science/biology/hh-suite {