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

fix: introduce the newest branch of ofborg

Browse source 
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
This commit is contained in:
raito 2024-11-14 18:58:07 +01:00
parent 9051ce73c6
commit ebdb7c8aef
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -747,21 +747,18 @@
} }
}, },
"ofborg": { "ofborg": {
"inputs": { "flake": false,
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1730127422, "lastModified": 1731607448,
"narHash": "sha256-mw03zyOQk0YFTWVuMuOMyEgbgOQgLqMIEHiiiGTYwvk=", "narHash": "sha256-Ia/Qn8kCe60pTOsRDbCPdUpkqkp3IyD+BZw11PQCWVk=",
"ref": "refs/heads/main", "ref": "refs/heads/vcs-generalization",
"rev": "829b4d2c458c1eaab932c1dcd62aa5873c68e208", "rev": "705adbb8e4c215724b9a33ca3cdecf6db10107cc",
"revCount": 1450, "revCount": 1465,
"type": "git", "type": "git",
"url": "https://git.lix.systems/the-distro/ofborg.git" "url": "https://git.lix.systems/the-distro/ofborg.git"
}, },
"original": { "original": {
"ref": "refs/heads/vcs-generalization",
"type": "git", "type": "git",
"url": "https://git.lix.systems/the-distro/ofborg.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?ref=refs/heads/bump-minor-3_10"; nix-gerrit.url = "git+https://git.lix.systems/the-distro/nix-gerrit.git?ref=refs/heads/bump-minor-3_10";
nix-gerrit.inputs.nixpkgs.follows = "nixpkgs"; nix-gerrit.inputs.nixpkgs.follows = "nixpkgs";
ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git"; ofborg.url = "git+https://git.lix.systems/the-distro/ofborg.git?ref=refs/heads/vcs-generalization";
ofborg.inputs.nixpkgs.follows = "nixpkgs"; ofborg.flake = false;
gerrit-dashboard.url = "git+https://git.lix.systems/the-distro/gerrit-monitoring.git"; gerrit-dashboard.url = "git+https://git.lix.systems/the-distro/gerrit-monitoring.git";
gerrit-dashboard.flake = false; gerrit-dashboard.flake = false;
@ -45,7 +45,7 @@
}; };
}; };
outputs = { self, nixpkgs, terranix, colmena, ... } @ inputs: outputs = { self, nixpkgs, terranix, colmena, ofborg, ... } @ inputs:
let let
supportedSystems = [ "x86_64-linux" "aarch64-linux" ]; supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forEachSystem = f: builtins.listToAttrs (map (system: { forEachSystem = f: builtins.listToAttrs (map (system: {
@ -61,9 +61,9 @@
inputs.lix.overlays.default inputs.lix.overlays.default
inputs.nix-gerrit.overlays.default inputs.nix-gerrit.overlays.default
inputs.channel-scripts.overlays.default inputs.channel-scripts.overlays.default
(super: self: { (import inputs.ofborg {
inherit (inputs.ofborg.packages.${system}) ofborg; pkgs = import nixpkgs { localSystem = system; };
}) }).overlay
(import "${inputs.stateless-uptime-kuma}/overlay.nix") (import "${inputs.stateless-uptime-kuma}/overlay.nix")
]; ];
}; };