flake: not use submodule

This commit is contained in:
2026-01-06 21:17:52 +08:00
parent 163faa0db3
commit 0389536c9d
6 changed files with 33 additions and 17 deletions

6
.gitmodules vendored
View File

@@ -1,6 +0,0 @@
[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

36
flake.lock generated
View File

@@ -1161,14 +1161,19 @@
},
"nixpkgs_3": {
"locked": {
"path": "nixpkgs",
"type": "path"
"lastModified": 1767694262,
"narHash": "sha256-xpFtS6JGpwaDVqXWEYDfoLb05oLEAL1VE2GF9x8smDk=",
"owner": "CHN-beta",
"repo": "nixpkgs",
"rev": "ae0b0157cbfee59adb0d6211ea6e47299a173cd5",
"type": "github"
},
"original": {
"path": "nixpkgs",
"type": "path"
},
"parent": []
"owner": "CHN-beta",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvirt": {
"inputs": {
@@ -1491,6 +1496,7 @@
"sticker": "sticker",
"stickerpicker": "stickerpicker",
"tgbot-cpp": "tgbot-cpp",
"ufo": "ufo",
"v-sim": "v-sim",
"vaspberry": "vaspberry",
"winapps": "winapps",
@@ -1776,6 +1782,24 @@
"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": {

View File

@@ -3,8 +3,7 @@
inputs =
{
self = { submodules = true; lfs = true; };
nixpkgs.url = ./nixpkgs;
nixpkgs.url = "github:CHN-beta/nixpkgs/nixos-25.11";
nixpkgs-2505.url = "github:CHN-beta/nixpkgs/nixos-25.05";
nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11";
nixpkgs-2311.url = "github:CHN-beta/nixpkgs/nixos-23.11";
@@ -66,6 +65,7 @@
sqlgen = { url = "git+https://github.com/getml/sqlgen?submodules=1"; flake = false; };
reflectcpp = { url = "git+https://github.com/getml/reflect-cpp?submodules=1"; flake = false; };
linux-asus = { url = "github:CHN-beta/linux-g14/6.18"; flake = false; };
ufo = { url = "git+https://git.chn.moe/chn/ufo.git?lfs=1"; flake = false; };
};
outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in

Submodule nixpkgs deleted from ae0b0157cb

View File

@@ -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 ./ufo { inherit biu matplotplusplus; tbb = inputs.pkgs.tbb_2022; };
ufo = inputs.pkgs.callPackage inputs.topInputs.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; };

Submodule packages/ufo deleted from 19736049c9