From 1615a20b316f8ec32b3f847a346cb63d2e7eb184 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 16 Aug 2024 22:58:15 -0500 Subject: [PATCH] Support 24.05 and unstable xonsh --- modules/nixos/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 83c98bc..3bff028 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,7 +1,9 @@ { config, pkgs, inputs, lib, ... }: let - crowe = inputs.crowe.legacyPackages."${pkgs.stdenv.system}"; + x = if builtins.hasAttr "wrapper" pkgs.xonsh.passthru then + pkgs.xonsh.passthru.wrapper else + pkgs.xonsh; in { imports = [ ../baseline.nix @@ -50,7 +52,7 @@ in { programs.xonsh = { enable = true; - package = (pkgs.xonsh.passthru.wrapper.override { + package = (x.override { extraPackages = (ps: with ps; [ (ps.toPythonModule pkgs.pipenv) pyyaml