the-distro/infra
9
0
Fork 5
Code Issues 39 Pull requests 8 Packages Projects 1 Releases Wiki Activity

WIP: feat: introduce ofborg builder #151

Draft
raito wants to merge 9 commits from ofborg into main
pull from: ofborg
merge into: the-distro:main
Conversation 0 Commits 9 Files changed 7 +13 -16
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aeb2129099 - Show all commits

17
flake.lock
View file

@ -746,21 +746,18 @@
}
},
"ofborg": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"flake": false,
"locked": {
"lastModified": 1730127422,
"narHash": "sha256-mw03zyOQk0YFTWVuMuOMyEgbgOQgLqMIEHiiiGTYwvk=",
"ref": "refs/heads/main",
"rev": "829b4d2c458c1eaab932c1dcd62aa5873c68e208",
"revCount": 1450,
"lastModified": 1731607448,
"narHash": "sha256-Ia/Qn8kCe60pTOsRDbCPdUpkqkp3IyD+BZw11PQCWVk=",
"ref": "refs/heads/vcs-generalization",
"rev": "705adbb8e4c215724b9a33ca3cdecf6db10107cc",
"revCount": 1465,
"type": "git",
"url": "https://git.lix.systems/the-distro/ofborg.git"
},
"original": {
"ref": "refs/heads/vcs-generalization",
"type": "git",
"url": "https://git.lix.systems/the-distro/ofborg.git"
}

12
flake.nix
View file

@ -19,8 +19,8 @@
nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git";
nix-gerrit.inputs.nixpkgs.follows = "nixpkgs";
ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git";
ofborg.inputs.nixpkgs.follows = "nixpkgs";
ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git?ref=refs/heads/vcs-generalization";
ofborg.flake = false;
gerrit-dashboard.url = "git+https://git.lix.systems/the-distro/gerrit-monitoring.git";
gerrit-dashboard.flake = false;
@ -45,7 +45,7 @@
};
};
outputs = { self, nixpkgs, terranix, colmena, ... } @ inputs:
outputs = { self, nixpkgs, terranix, colmena, ofborg, ... } @ inputs:
let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forEachSystem = f: builtins.listToAttrs (map (system: {
@ -61,9 +61,9 @@
inputs.lix.overlays.default
inputs.nix-gerrit.overlays.default
inputs.channel-scripts.overlays.default
(super: self: {
inherit (inputs.ofborg.packages.${system}) ofborg;
})
(import inputs.ofborg {
pkgs = import nixpkgs { localSystem = system; };
}).overlay
(import "${inputs.stateless-uptime-kuma}/overlay.nix")
];
};