diff --git a/flake.lock b/flake.lock index dfa8cf6..ccf2a34 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1739580444, - "narHash": "sha256-+/bSz4EAVbqz8/HsIGLroF8aNaO8bLRL7WfACN+24g4=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb37161a0488b89830168b81c48aed11569cb93", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d84f889..e22d60e 100644 --- a/flake.nix +++ b/flake.nix @@ -14,19 +14,6 @@ f { 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 { overlays.default = _: prev: (builtins.listToAttrs ( builtins.map ( @@ -35,7 +22,7 @@ value = prev.callPackage ./packages/${name} {inherit inputs;}; } ) (builtins.attrNames ( - filterAttrs ( + nixpkgs.lib.filterAttrs ( _: v: v == "directory" ) (builtins.readDir ./packages) )) diff --git a/packages/amadaluzian-xonsh/default.nix b/packages/amadaluzian-xonsh/default.nix index eeabec1..c527e13 100644 --- a/packages/amadaluzian-xonsh/default.nix +++ b/packages/amadaluzian-xonsh/default.nix @@ -6,6 +6,7 @@ inputs, system, zoxide, + ... # fuck you nixpkgs }: let xonsh = python3