fix(xonsh): account for new nixos option

This commit is contained in:
Artur Manuel 2025-02-22 12:51:33 +00:00
commit 607e6a486d
Signed by: amadaluzia
SSH key fingerprint: SHA256:Zwg7gBuZyaG48ucAZneJwltiXu0+tJb7c3lYt9AYlLg
3 changed files with 5 additions and 17 deletions

6
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739580444, "lastModified": 1739866667,
"narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bb37161a0488b89830168b81c48aed11569cb93", "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -14,19 +14,6 @@
f { f {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
}); });
filterAttrs = f: attrs: let
names = builtins.attrNames attrs;
filtered = builtins.filter (n: f n attrs.${n}) names;
in
builtins.listToAttrs (
map (
name: {
inherit name;
value = attrs.${name};
}
)
filtered
);
in { in {
overlays.default = _: prev: (builtins.listToAttrs ( overlays.default = _: prev: (builtins.listToAttrs (
builtins.map ( builtins.map (
@ -35,7 +22,7 @@
value = prev.callPackage ./packages/${name} {inherit inputs;}; value = prev.callPackage ./packages/${name} {inherit inputs;};
} }
) (builtins.attrNames ( ) (builtins.attrNames (
filterAttrs ( nixpkgs.lib.filterAttrs (
_: v: v == "directory" _: v: v == "directory"
) (builtins.readDir ./packages) ) (builtins.readDir ./packages)
)) ))

View file

@ -6,6 +6,7 @@
inputs, inputs,
system, system,
zoxide, zoxide,
... # fuck you nixpkgs
}: let }: let
xonsh = xonsh =
python3 python3