Origami404/flake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

host/oparic: switch to oparic-flakes lib.mkOparicContainer

Browse Source 
Replace container-flake (feat/o4dev branch) dependency with
oparic-flakes (main) + direct o4dev service inputs. Container
is now built via mkOparicContainer with local config and secrets.
This commit is contained in:
Origami404
2026-05-17 20:00:07 +08:00
parent ae0fc05e6d
commit b869120287
5 changed files with 106 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+39 -40
View File
@@ -1,34 +1,5 @@
{
"nodes": {
"container-flake": {
"inputs": {
"nixpkgs": "nixpkgs",
"o4dev-admin": "o4dev-admin",
"o4dev-backend": "o4dev-backend",
"o4dev-workflows": "o4dev-workflows",
"production-admin": "production-admin",
"production-backend": "production-backend",
"production-workflows": "production-workflows",
"sops-nix": "sops-nix",
"staging-admin": "staging-admin",
"staging-backend": "staging-backend",
"staging-workflows": "staging-workflows"
},
"locked": {
"lastModified": 1779016756,
"narHash": "sha256-3JVsqxbWOQTl8i1o8xq4WXXuWzZukAIXrGff266SkeE=",
"ref": "refs/heads/feat/o4dev",
"rev": "4223b65050b99382ddaaa366cf046035a4ce847c",
"revCount": 25,
"type": "git",
"url": "ssh://gitea@git.inclyc.cn:20122/oparic/container-flake"
},
"original": {
"ref": "refs/heads/feat/o4dev",
"type": "git",
"url": "ssh://gitea@git.inclyc.cn:20122/oparic/container-flake"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
@@ -322,7 +293,7 @@
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -345,7 +316,7 @@
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -368,7 +339,7 @@
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -387,11 +358,36 @@
"url": "ssh://gitea@git.inclyc.cn:20122/oparic/workflows"
}
},
"oparic-flakes": {
"inputs": {
"nixpkgs": "nixpkgs",
"production-admin": "production-admin",
"production-backend": "production-backend",
"production-workflows": "production-workflows",
"sops-nix": "sops-nix",
"staging-admin": "staging-admin",
"staging-backend": "staging-backend",
"staging-workflows": "staging-workflows"
},
"locked": {
"lastModified": 1779018524,
"narHash": "sha256-F4B2BMAFTwNbyAVNF95jTGSN+neogbqzpzkfFbJVzqU=",
"ref": "refs/heads/main",
"rev": "5c8b28a88f27fd88e9afb06d21cbf0ac19f7dcaf",
"revCount": 26,
"type": "git",
"url": "ssh://gitea@git.inclyc.cn:20122/oparic/container-flake"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.inclyc.cn:20122/oparic/container-flake"
}
},
"production-admin": {
"inputs": {
"flake-utils": "flake-utils_4",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -414,7 +410,7 @@
"inputs": {
"flake-utils": "flake-utils_5",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -437,7 +433,7 @@
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -458,19 +454,22 @@
},
"root": {
"inputs": {
"container-flake": "container-flake",
"darwin": "darwin",
"home-manager": "home-manager",
"home-manager-darwin": "home-manager-darwin",
"nixpkgs-darwin": "nixpkgs-darwin",
"nixpkgs-linux": "nixpkgs-linux",
"o4dev-admin": "o4dev-admin",
"o4dev-backend": "o4dev-backend",
"o4dev-workflows": "o4dev-workflows",
"oparic-flakes": "oparic-flakes",
"sops-nix": "sops-nix_2"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -510,7 +509,7 @@
"inputs": {
"flake-utils": "flake-utils_7",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -533,7 +532,7 @@
"inputs": {
"flake-utils": "flake-utils_8",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},
@@ -556,7 +555,7 @@
"inputs": {
"flake-utils": "flake-utils_9",
"nixpkgs": [
"container-flake",
"oparic-flakes",
"nixpkgs"
]
},