Support 24.05 and unstable xonsh

This commit is contained in:
Greg Hellings
2024-08-16 22:58:15 -05:00
parent 4d4beaf620
commit 1615a20b31
+4 -2
View File
@@ -1,7 +1,9 @@
{ config, pkgs, inputs, lib, ... }: { config, pkgs, inputs, lib, ... }:
let 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 { in {
imports = [ imports = [
../baseline.nix ../baseline.nix
@@ -50,7 +52,7 @@ in {
programs.xonsh = { programs.xonsh = {
enable = true; enable = true;
package = (pkgs.xonsh.passthru.wrapper.override { package = (x.override {
extraPackages = (ps: with ps; [ extraPackages = (ps: with ps; [
(ps.toPythonModule pkgs.pipenv) (ps.toPythonModule pkgs.pipenv)
pyyaml pyyaml