rarias/jungle
rarias/jungle
2
0
Fork 2
Code Issues 52 Pull Requests 9 Actions Packages Projects Releases Wiki Activity

Merge flake.nix with bscpkgs

Browse Source
This commit is contained in:
Rodrigo Arias 2025-10-07 10:38:57 +02:00
parent 94f4ba6468
commit 725520a7a7
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flake.nix
View File

@ -14,6 +14,12 @@ let
specialArgs = { inherit nixpkgs bscpkgs agenix; theFlake = self; };
modules = [ "${self.outPath}/m/${name}/configuration.nix" ];
};
# For now we only support x86
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [ self.overlays.default ];
};
in
{
nixosConfigurations = {
@ -31,36 +37,22 @@ in
weasel = mkConf "weasel";
};
packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // {
bscpkgs = bscpkgs.packages.x86_64-linux;
nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
};
};
#packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // {
# bscpkgs = bscpkgs.packages.x86_64-linux;
# nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
#};
# TODO: Merge from bscpkgs:
#
# inputs.nixpkgs.url = "nixpkgs";
#
# outputs = { self, nixpkgs, ...}:
# let
# # For now we only support x86
# system = "x86_64-linux";
# pkgs = import nixpkgs {
# inherit system;
# overlays = [ self.overlays.default ];
# };
# in
# {
# bscOverlay = import ./overlay.nix;
# overlays.default = self.bscOverlay;
# # full nixpkgs with our overlay applied
# legacyPackages.${system} = pkgs;
#
# hydraJobs = {
# inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
# };
#
# # propagate nixpkgs lib, so we can do bscpkgs.lib
# inherit (nixpkgs) lib;
# };
bscOverlay = import ./overlay.nix;
overlays.default = self.bscOverlay;
# full nixpkgs with our overlay applied
legacyPackages.${system} = pkgs;
hydraJobs = {
inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
};
# propagate nixpkgs lib, so we can do bscpkgs.lib
inherit (nixpkgs) lib;
};
}