diff --git a/.gitmodules b/.gitmodules index 033d30c5..57f7987b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "nixpkgs"] path = nixpkgs url = https://github.com/CHN-beta/nixpkgs.git +[submodule "packages/ufo"] + path = packages/ufo + url = https://git.chn.moe/chn/ufo.git diff --git a/flake.lock b/flake.lock index 37ee9925..b15d853a 100644 --- a/flake.lock +++ b/flake.lock @@ -1491,7 +1491,6 @@ "sticker": "sticker", "stickerpicker": "stickerpicker", "tgbot-cpp": "tgbot-cpp", - "ufo": "ufo", "v-sim": "v-sim", "vaspberry": "vaspberry", "winapps": "winapps", @@ -1777,24 +1776,6 @@ "type": "github" } }, - "ufo": { - "flake": false, - "locked": { - "lastModified": 1767597695, - "lfs": true, - "narHash": "sha256-JNCSBKjslaT4kjMCWCImN1iS9ZRwfCN4GpP7dWECdas=", - "ref": "refs/heads/main", - "rev": "19736049c9e117c642f3f0a5e81af5cf2a40b392", - "revCount": 86, - "type": "git", - "url": "https://git.chn.moe/chn/ufo.git" - }, - "original": { - "lfs": true, - "type": "git", - "url": "https://git.chn.moe/chn/ufo.git" - } - }, "v-sim": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index d8558973..5b5152a1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { - self.submodules = true; + self = { submodules = true; lfs = true; }; nixpkgs.url = ./nixpkgs; nixpkgs-2505.url = "github:CHN-beta/nixpkgs/nixos-25.05"; nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11"; @@ -54,7 +54,6 @@ pocketfft = { url = "github:mreineck/pocketfft"; flake = false; }; blog = { url = "git+https://git.chn.moe/chn/blog-public.git?lfs=1"; flake = false; }; vaspberry = { url = "github:Infant83/VASPBERRY"; flake = false; }; - ufo = { url = "git+https://git.chn.moe/chn/ufo.git?lfs=1"; flake = false; }; stickerpicker = { url = "github:maunium/stickerpicker"; flake = false; }; fancy-motd = { url = "github:CHN-beta/fancy-motd"; flake = false; }; mac-style = { url = "github:SergioRibera/s4rchiso-plymouth-theme?lfs=1"; flake = false; }; diff --git a/packages/default.nix b/packages/default.nix index 3e590ec1..e0f8220b 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -72,7 +72,7 @@ inputs: rec 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; }; - ufo = inputs.pkgs.callPackage inputs.topInputs.ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; }; + ufo = inputs.pkgs.callPackage ./ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; }; chn-bsub = inputs.pkgs.callPackage ./chn-bsub { inherit biu; }; py4vasp = inputs.pkgs.python3Packages.callPackage ./py4vasp.nix { src = inputs.topInputs.py4vasp; }; pocketfft = inputs.pkgs.callPackage ./pocketfft.nix { src = inputs.topInputs.pocketfft; }; diff --git a/packages/ufo b/packages/ufo new file mode 160000 index 00000000..19736049 --- /dev/null +++ b/packages/ufo @@ -0,0 +1 @@ +Subproject commit 19736049c9e117c642f3f0a5e81af5cf2a40b392