diff --git a/flake.lock b/flake.lock index c7d3a04f..62273058 100644 --- a/flake.lock +++ b/flake.lock @@ -54,6 +54,22 @@ "url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz" } }, + "biu": { + "flake": false, + "locked": { + "lastModified": 1711969538, + "narHash": "sha256-wGw+f7okXUDueWrUjRVqPb3Kx/OwIP8xrfvYRXbrAww=", + "owner": "CHN-beta", + "repo": "biu", + "rev": "dbdc36394271f859f25cabaceed971898741a1c6", + "type": "github" + }, + "original": { + "owner": "CHN-beta", + "repo": "biu", + "type": "github" + } + }, "blurred-wallpaper": { "flake": false, "locked": { @@ -1937,6 +1953,7 @@ "root": { "inputs": { "aagl": "aagl", + "biu": "biu", "blurred-wallpaper": "blurred-wallpaper", "chaotic": "chaotic", "citation-style-language": "citation-style-language", diff --git a/flake.nix b/flake.nix index e0f135a2..fa11c1ed 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,7 @@ lmod = { url = "github:TACC/Lmod"; flake = false; }; mumax = { url = "github:CHN-beta/mumax"; flake = false; }; kylin-virtual-keyboard = { url = "git+https://gitee.com/openkylin/kylin-virtual-keyboard.git"; flake = false; }; + biu = { url = "github:CHN-beta/biu"; flake = false; }; }; outputs = inputs: diff --git a/local/pkgs/biu/default.nix b/local/pkgs/biu/default.nix deleted file mode 100644 index 480bef50..00000000 --- a/local/pkgs/biu/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - stdenv, fetchFromGitHub, cmake, pkg-config, ninja, - fmt, boost, magic-enum, libbacktrace, concurrencpp, tgbot-cpp, nameof, eigen, range-v3 -}: stdenv.mkDerivation rec -{ - name = "libbiu"; - src = fetchFromGitHub - { - owner = "CHN-beta"; - repo = "biu"; - rev = "8ed2e52968f98d3a6ddbd01e86e57604ba3a7f54"; - sha256 = "OqQ+QkjjIbpve/xn/DJA7ONw/bBg5zGNr+VJjc3o+K8="; - }; - nativeBuildInputs = [ cmake pkg-config ninja ]; - buildInputs = [ fmt boost magic-enum libbacktrace concurrencpp tgbot-cpp nameof eigen range-v3 ]; - propagatedBuildInputs = buildInputs; -} diff --git a/local/pkgs/default.nix b/local/pkgs/default.nix index 13412dec..f76ca1a2 100644 --- a/local/pkgs/default.nix +++ b/local/pkgs/default.nix @@ -20,7 +20,6 @@ inputs: rec chromiumos-touch-keyboard = inputs.pkgs.callPackage ./chromiumos-touch-keyboard {}; yoga-support = inputs.pkgs.callPackage ./yoga-support {}; tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp { src = inputs.topInputs.tgbot-cpp; }; - biu = inputs.pkgs.callPackage ./biu { inherit concurrencpp tgbot-cpp nameof; stdenv = inputs.pkgs.gcc13Stdenv; }; citation-style-language = inputs.pkgs.callPackage ./citation-style-language { src = inputs.topInputs.citation-style-language; }; mirism = inputs.pkgs.callPackage ./mirism @@ -81,6 +80,7 @@ inputs: rec aocl = inputs.pkgs.callPackage ./aocl {}; kylin-virtual-keyboard = inputs.pkgs.libsForQt5.callPackage ./kylin-virtual-keyboard { src = inputs.topInputs.kylin-virtual-keyboard; }; + biu = inputs.pkgs.callPackage inputs.topInputs.biu { inherit nameof; }; fromYaml = content: builtins.fromJSON (builtins.readFile (inputs.pkgs.runCommand "toJSON" {} diff --git a/modules/packages/server/default.nix b/modules/packages/server/default.nix index a221b171..ad25b30e 100644 --- a/modules/packages/server/default.nix +++ b/modules/packages/server/default.nix @@ -48,7 +48,7 @@ inputs: nodejs # library fmt fmt.dev localPackages.nameof localPackages.matplotplusplus highfive hdf5 hdf5.dev - localPackages.concurrencpp + localPackages.concurrencpp localPackages.biu localPackages.magik-enum ( runCommand "concurrencpp" {} "mkdir $out; ln -s ${localPackages.concurrencpp}/include/concurrencpp-* $out/include"