From 84a77fdc975040db0af595e1d56a24d048d730ff Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Wed, 6 Nov 2024 16:38:29 +0100 Subject: [PATCH] treewide: pass permittedInsecurePackages directly to bolt-launcher in outputs --- flake.nix | 2 +- pkgs/default.nix | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 59f9f73..0a6b284 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ lib' = import ./lib {inherit inputs lib';}; in import ./hosts {inherit inputs lib';}; - packages = eachSystem (pkgs: import ./pkgs pkgs); + packages = eachSystem (pkgs: import ./pkgs {inherit inputs pkgs;}); deploy.nodes = import ./nodes {inherit self inputs;}; }; inputs = { diff --git a/pkgs/default.nix b/pkgs/default.nix index 876d93b..0cf4299 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,4 +1,15 @@ -pkgs: { +{ + inputs, + pkgs, + ... +}: { mcuxpresso = import ./mcuxpresso pkgs; - bolt-launcher = pkgs.callPackage ./bolt-launcher.nix {}; + # this is unfortunately needed since bolt-launcher makes use of openssl-1.1.1w, and since it is not part of hosts, we have to add it this way + bolt-launcher = + (import inputs.nixpkgs { + inherit (pkgs) system; + config.permittedInsecurePackages = ["openssl-1.1.1w"]; + }) + .callPackage + ./bolt-launcher.nix {}; }