update flakes

heal-research · Nov 27, 2024 · 6402e86 · 6402e86
1 parent 72df9d5
commit 6402e86
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/flake.nix b/flake.nix
@@ -36,14 +36,15 @@
               })
             ];
           };
-          stdenv = pkgs.llvmPackages_18.stdenv;
+          stdenv = pkgs.llvmPackages_19.stdenv;
+          #stdenv = pkgs.gcc12Stdenv;
           operon = import ./operon.nix { inherit stdenv pkgs system; };
         in
         rec
         {
           packages = {
             default = operon.overrideAttrs (old: {
-              cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" ];
+              cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_CLI_PROGRAMS=ON" "-DCPM_USE_LOCAL_PACKAGES=ON" ];
             });
 
             library = operon.overrideAttrs (old: {
@@ -59,15 +60,14 @@
             name = "operon";
 
             nativeBuildInputs = operon.nativeBuildInputs ++ (with pkgs; [
-              clang-tools_18
+              clang-tools_19
               cppcheck
               include-what-you-use
               cmake-language-server
             ]);
 
             buildInputs = operon.buildInputs ++ (with pkgs; [
               gdb
-              gcc13
               graphviz
               hyperfine
               linuxPackages_latest.perf

diff --git a/operon.nix b/operon.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     "x86_64-linux"   = "build-linux";
     "x86_64-darwin"  = "build-linux";
     "aarch64-darwin" = "build-osx";
-  }."${system}"; 
+  }."${system}";
 
   cmakeFlags = [
     "--preset ${cmakePreset}"
@@ -27,9 +27,8 @@ stdenv.mkDerivation rec {
     doctest
     eigen
     eve
-    fast-float
+    (fast-float.overrideAttrs({ version = "6.1.6"; }))
     fmt
-    icu
     jemalloc
     cpptrace
     libassert