From c87826975b61a303d784a83935475ec9b4447f04 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 21 Aug 2024 08:16:48 -0500 Subject: [PATCH] Move 23_ 05 support Putting 23_05 directly into the top level overlays introduced unnecessary calculations when it is only used in one location on the IVR system. Therefore, we only import it at the point of its use. --- flake.nix | 4 ---- home/hosts/ivr/default.nix | 6 +++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index d6a4169..b9aa43e 100644 --- a/flake.nix +++ b/flake.nix @@ -49,13 +49,9 @@ self, ...}@inputs: let - pkg-sets = final: prev: { - nix23_05 = import inputs.nix23_05 { system = final.system; inherit overlays; }; - }; local_overlay = import ./overlays; overlays = [ agenix.overlays.default - pkg-sets local_overlay nurpkgs.overlay ]; diff --git a/home/hosts/ivr/default.nix b/home/hosts/ivr/default.nix index 3d1dd3b..1d6d7dd 100644 --- a/home/hosts/ivr/default.nix +++ b/home/hosts/ivr/default.nix @@ -1,6 +1,10 @@ { pkgs, lib, inputs, ...}: let - py = pkgs.nix23_05.python311.withPackages ( p: with p; [ + nix23 = import inputs.nix23_05 { + inherit (pkgs.stdenv) system; + overlays = [ inputs.self.overlays.default ]; + }; + py = nix23.python311.withPackages ( p: with p; [ django djangorestframework django-rapyd-modernauth