Overhaul October 2024

.github/workflows/build/osx/action.yml

@@ -15,7 +15,7 @@ runs:
   - name: Install Python Dependencies
     shell: bash
     run: |
-      pip3 install --user conan==1.*
+      pip3 install --user conan==1.* --break-system-packages
 
   - name: Download HDF5 Artifacts
     shell: bash
@@ -29,11 +29,10 @@ runs:
       set -ex
       export PATH="$(python3 -m site --user-base)/bin:$PATH"
       HDF5_DIR="$(pwd)/${{ env.hdf5tag }}"
-      GSL_DIR="/usr/local/Cellar/gsl/2.7.1"
       mkdir build && cd build
 
       conan install ../
-      cmake ../ -G Ninja -DCMAKE_Fortran_COMPILER:string="gfortran-11" -DLOCAL_STATIC_HDF5:bool=true -DHDF5_DIR:path=${HDF5_DIR} -DLOCAL_STATIC_GSL:bool=true -DGSL_DIR:path=${GSL_DIR}
+      cmake ../ -G Ninja -DLOCAL_STATIC_HDF5:bool=true -DHDF5_DIR:path=${HDF5_DIR}
       ninja
 
   - name: Create Zip

CMakeLists.txt

@@ -44,6 +44,7 @@ if(LOCAL_STATIC_GSL)
 else(LOCAL_STATIC_GSL)
   find_package(GSL REQUIRED)
   list(APPEND LINK_LIBS "${GSL_LIBRARIES}")
+  include_directories("${GSL_INCLUDE_DIRS}")
 endif(LOCAL_STATIC_GSL)
 
 option(
@@ -140,8 +141,7 @@ if(BUILD_HDF)
   endif(BUILD_SZIP)
 else(BUILD_HDF)
   if(LOCAL_STATIC_HDF5)
-    list(APPEND LINK_LIBS "${HDF5_DIR}/lib/libhdf5_cpp.a"
-          "${HDF5_DIR}/lib/libhdf5.a"
+    list(APPEND LINK_LIBS "${HDF5_DIR}/lib/libhdf5.a"
           "${HDF5_DIR}/lib/libszip-static.a")
     if(WIN32)
       list(APPEND LINK_LIBS "${HDF5_DIR}/lib/libzlibstatic.a")

flake.nix

@@ -1,8 +1,8 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
-    future.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
     outdated.url = "github:NixOS/nixpkgs/nixos-21.05";
+    future.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
   outputs =
     { self, nixpkgs, future, outdated, flake-utils, bundlers }:
@@ -34,13 +34,11 @@
         name = "np-shell";
         buildInputs = base_libs pkgs
           ++ (with pkgs; [
-          (pkgs.clang-tools.override {
-            llvmPackages = pkgs.llvmPackages_13;
-          })
           ccache
           ccls
           cmake-format
           cmake-language-server
+          clang-tools
           distcc
           gdb
           valgrind