From 46d07da40468657d31450311c529f3633d9ae6ed Mon Sep 17 00:00:00 2001 From: Ryan Lahfa Date: Sun, 8 Sep 2024 00:50:29 +0200 Subject: [PATCH] fix(hive): misc fixes regarding the nixpkgs usage Previously, we were using actually, we fixed liminix and this file to ensure that we are instantiating the right nixpkgs. This helps to deal with unexpected mass rebuilds. Signed-off-by: Ryan Lahfa --- hive.nix | 61 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 23 deletions(-) diff --git a/hive.nix b/hive.nix index 71180d5..139b978 100644 --- a/hive.nix +++ b/hive.nix @@ -46,24 +46,27 @@ let inherit version; }; + mkNixpkgsConfigPerSystem = + system: _: + if system == "nixos" then + { } + else + (import "${sources.liminix}/devices/${system}").system + // { + overlays = [ (import "${sources.liminix}/overlay.nix") ]; + config = { + allowUnsupportedSystem = true; # mipsel + permittedInsecurePackages = [ + "python-2.7.18.8" # Python < 3 is needed for kernel backports. + ]; + }; + }; + # Instanciate a specialized version of nixpkgs mkSystemNixpkgs = system: version: let - args = - if system == "nixos" then - { } - else - (import "${sources.liminix}/devices/${system}").system - // { - overlays = [ (import "${sources.liminix}/overlay.nix") ]; - config = { - allowUnsupportedSystem = true; # mipsel - permittedInsecurePackages = [ - "python-2.7.18.8" # Python < 3 is needed for kernel backports. - ]; - }; - }; + args = mkNixpkgsConfigPerSystem system version; in import (mkNixpkgs' version) args; @@ -93,19 +96,31 @@ in { registry = { zyxel-nwa50ax = { - evalConfig = import "${sources.liminix}/lib/eval-config.nix" { nixpkgs = sources.nixos-unstable; }; + evalConfig = import "${sources.liminix}/lib/eval-config.nix" { + nixpkgs = sources.nixos-unstable; + }; defaults = _: { - nixpkgs.hostPlatform = { - config = "mipsel-unknown-linux-musl"; - gcc = { - abi = "32"; - arch = "mips32"; # mips32r2? + nixpkgs = { + source = sources.nixos-unstable; + config = { + allowUnsupportedSystem = true; # mipsel + permittedInsecurePackages = [ + "python-2.7.18.8" # Python < 3 is needed for kernel backports. + ]; }; + hostPlatform = { + config = "mipsel-unknown-linux-musl"; + gcc = { + abi = "32"; + arch = "mips32"; # mips32r2? + }; + }; + + # It's impure, but who cares? + # Can Flakes do that? + buildPlatform = builtins.currentSystem; }; - # It's impure, but who cares? - # Can Flakes do that? - nixpkgs.buildPlatform = builtins.currentSystem; }; };