rarias/bscpkgs
rarias/bscpkgs
Archived
2
0
Fork 3
Code Issues 2 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Merge flake.nix with bscpkgs

Browse Source 
Reviewed-by: Aleix Boné <abonerib@bsc.es>
This commit is contained in:
Rodrigo Arias 2025-10-07 10:38:57 +02:00
parent 826d6a28ef
commit b94a1493d5
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; }; specialArgs = { inherit nixpkgs bscpkgs agenix; theFlake = self; };
modules = [ "${self.outPath}/m/${name}/configuration.nix" ]; 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 in
{ {
nixosConfigurations = { nixosConfigurations = {
@ -31,36 +37,22 @@ in
weasel = mkConf "weasel"; weasel = mkConf "weasel";
}; };
packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // { #packages.x86_64-linux = self.nixosConfigurations.hut.pkgs // {
bscpkgs = bscpkgs.packages.x86_64-linux; # bscpkgs = bscpkgs.packages.x86_64-linux;
nixpkgs = nixpkgs.legacyPackages.x86_64-linux; # nixpkgs = nixpkgs.legacyPackages.x86_64-linux;
}; #};
};
# TODO: Merge from bscpkgs: bscOverlay = import ./overlay.nix;
# overlays.default = self.bscOverlay;
# inputs.nixpkgs.url = "nixpkgs";
# # full nixpkgs with our overlay applied
# outputs = { self, nixpkgs, ...}: legacyPackages.${system} = pkgs;
# let
# # For now we only support x86 hydraJobs = {
# system = "x86_64-linux"; inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
# pkgs = import nixpkgs { };
# inherit system;
# overlays = [ self.overlays.default ]; # propagate nixpkgs lib, so we can do bscpkgs.lib
# }; inherit (nixpkgs) lib;
# 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;
# };
} }