diff --git a/flake/dev.nix b/flake/dev.nix index f887fd68..ed494359 100644 --- a/flake/dev.nix +++ b/flake/dev.nix @@ -1,64 +1,64 @@ { inputs }: let inherit (inputs.self.nixosConfigurations.pc) pkgs; in { - biu = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + biu = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.biu ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - hpcstat = pkgs.mkShell.override { stdenv = pkgs.gcc14Stdenv; } + hpcstat = pkgs.mkShell { inputsFrom = [ (pkgs.localPackages.hpcstat.override { version = null; }) ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - sbatch-tui = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + sbatch-tui = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.sbatch-tui ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - ufo = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + ufo = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.ufo ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; chn-bsub = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.chn-bsub ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; }; - info = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + info = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.info ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - vm = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + vm = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.vm ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - xinli = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + xinli = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.xinli ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; - missgram = pkgs.mkShell.override { stdenv = pkgs.clang18Stdenv; } + missgram = pkgs.mkShell { inputsFrom = [ pkgs.localPackages.missgram ]; - packages = [ pkgs.llvmPackages_18.clang-tools ]; + packages = [ pkgs.llvmPackages.clang-tools ]; CMAKE_EXPORT_COMPILE_COMMANDS = "1"; hardeningDisable = [ "all" ]; }; diff --git a/flake/packages.nix b/flake/packages.nix index b40f696f..69e990a6 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -12,9 +12,7 @@ duc = pkgs.pkgsStatic.duc.override { enableCairo = false; cairo = null; pango = null; }; glaze = pkgs.pkgs-2411.pkgsStatic.glaze.overrideAttrs (prev: { cmakeFlags = prev.cmakeFlags ++ [ "-Dglaze_ENABLE_FUZZING=OFF" ]; }); - # pkgsStatic.clangStdenv have a bug - # https://github.com/NixOS/nixpkgs/issues/177129 - biu = pkgs.pkgsStatic.localPackages.biu.override { stdenv = pkgs.pkgsStatic.gcc14Stdenv; inherit glaze; }; + biu = pkgs.pkgsStatic.localPackages.biu; in pkgs.pkgsStatic.localPackages.hpcstat.override { inherit openssh duc biu; diff --git a/packages/biu/include/biu/serialize.hpp b/packages/biu/include/biu/serialize.hpp index c56ee127..ccadce30 100644 --- a/packages/biu/include/biu/serialize.hpp +++ b/packages/biu/include/biu/serialize.hpp @@ -15,10 +15,3 @@ namespace biu template T deserialize(const std::string& serialized_data); template T deserialize(const std::vector& serialized_data); } - -namespace std -{ - // TODO: remove at clang19 - template constexpr auto serialize(auto & archive, Complex& complex) - requires biu::SpecializationOf, std::complex>; -} diff --git a/packages/default.nix b/packages/default.nix index f57a45cb..675a8b24 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -14,11 +14,7 @@ inputs: rec }; v-sim = inputs.pkgs.callPackage ./v-sim.nix { src = inputs.topInputs.v-sim; }; concurrencpp = inputs.pkgs.callPackage ./concurrencpp.nix { src = inputs.topInputs.concurrencpp; }; - matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix - { - src = inputs.topInputs.matplotplusplus; - stdenv = inputs.pkgs.clang18Stdenv; - }; + matplotplusplus = inputs.pkgs.callPackage ./matplotplusplus.nix { src = inputs.topInputs.matplotplusplus; }; zpp-bits = inputs.pkgs.callPackage ./zpp-bits.nix { src = inputs.topInputs.zpp-bits; }; nameof = inputs.pkgs.callPackage ./nameof.nix { src = inputs.topInputs.nameof; }; pslist = inputs.pkgs.callPackage ./pslist.nix { src = inputs.topInputs.self.src.pslist; }; @@ -67,7 +63,6 @@ inputs: rec inherit nameof zpp-bits tgbot-cpp concurrencpp pocketfft; # TODO: report glaze bug to upstream inherit (inputs.pkgs.pkgs-2411) glaze; - stdenv = inputs.pkgs.clang18Stdenv; boost = (inputs.pkgs.boost188.override { extraB2Args = [ "boost.stacktrace.backtrace=on" ]; }).overrideAttrs (prev: { buildInputs = prev.buildInputs ++ [(inputs.pkgs.libbacktrace.override { enableStatic = true; })]; }); fmt = inputs.pkgs.fmt_11.overrideAttrs (prev: { patches = prev.patches or [] ++ [ ./biu/fmt.patch ]; }); @@ -77,12 +72,11 @@ inputs: rec openxlsx = inputs.pkgs.callPackage ./openxlsx.nix { src = inputs.topInputs.openxlsx; }; sqlite-orm = inputs.pkgs.callPackage ./sqlite-orm.nix { src = inputs.topInputs.sqlite-orm; }; mkPnpmPackage = inputs.pkgs.callPackage ./mkPnpmPackage.nix {}; - sbatch-tui = inputs.pkgs.callPackage ./sbatch-tui { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + sbatch-tui = inputs.pkgs.callPackage ./sbatch-tui { inherit biu; }; ufo = inputs.pkgs.callPackage inputs.topInputs.ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; - stdenv = inputs.pkgs.clang18Stdenv; }; chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; }; py4vasp = inputs.pkgs.python3Packages.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; }; @@ -112,14 +106,14 @@ inputs: rec ]; }; stickerpicker = inputs.pkgs.python3Packages.callPackage ./stickerpicker.nix { src = inputs.topInputs.stickerpicker; }; - info = inputs.pkgs.callPackage ./info { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + info = inputs.pkgs.callPackage ./info { inherit biu; }; blog = inputs.pkgs.callPackage inputs.topInputs.blog { inherit (inputs.topInputs) hextra; buildProxy = inputs.pkgs.lib.mkBuildproxy ./blog-buildproxy.nix; }; phono3py = inputs.pkgs.python3Packages.callPackage ./phono3py.nix { src = inputs.topInputs.phono3py; }; - vm = inputs.pkgs.callPackage ./vm { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + vm = inputs.pkgs.callPackage ./vm { inherit biu; }; oneapiPackages = inputs.pkgs.lib.makeScope inputs.pkgs.newScope (final: { stdenv = inputs.pkgs.callPackage ./oneapi/stdenv.nix { src = inputs.topInputs.self.src.oneapi; inherit gccFull; }; @@ -137,14 +131,14 @@ inputs: rec speedtest = inputs.pkgs.callPackage ./speedtest.nix { src = inputs.topInputs.speedtest; }; atat = inputs.pkgs.callPackage ./atat.nix { src = inputs.topInputs.self.src.atat; }; atomkit = inputs.pkgs.callPackage ./atomkit.nix { src = inputs.topInputs.self.src.atomkit; }; - xinli = inputs.pkgs.callPackage ./xinli { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; + xinli = inputs.pkgs.callPackage ./xinli { inherit biu; }; pybinding = inputs.pkgs.pkgs-2411.python310Packages.callPackage ./pybinding { src = inputs.topInputs.pybinding; buildProxy = inputs.pkgs.lib.mkBuildproxy ./pybinding/proxy.nix; }; brokenaxes = inputs.pkgs.python3Packages.callPackage ./brokenaxes.nix { src = inputs.topInputs.brokenaxes; }; - missgram = inputs.pkgs.callPackage ./missgram { inherit biu sqlgen; stdenv = inputs.pkgs.clang18Stdenv; }; + missgram = inputs.pkgs.callPackage ./missgram { inherit biu sqlgen; }; sqlgen = inputs.pkgs.callPackage ./sqlgen.nix { src = inputs.topInputs.sqlgen; inherit reflectcpp; }; reflectcpp = inputs.pkgs.callPackage ./reflectcpp.nix { src = inputs.topInputs.reflectcpp; }; lsf = inputs.pkgs.callPackage ./lsf.nix { src = inputs.topInputs.self.src.lsf; };