diff options
| author | Bloxx12 <charlie@charlieroot.dev> | 2025-07-13 23:28:38 +0200 |
|---|---|---|
| committer | Ivan Molodetskikh <yalterz@gmail.com> | 2025-07-15 15:55:45 +0300 |
| commit | 30a9c6c31b83443585e2af97989979e09a06d454 (patch) | |
| tree | 374a25bd329b6116b834d7cfbbf7daf85384472e | |
| parent | bc0a06226a03768519790917ff310df0e01de705 (diff) | |
| download | niri-30a9c6c31b83443585e2af97989979e09a06d454.tar.gz niri-30a9c6c31b83443585e2af97989979e09a06d454.tar.bz2 niri-30a9c6c31b83443585e2af97989979e09a06d454.zip | |
nix: replace nix-filter with lib.fileset
Co-authored-by: sodiboo <git@sodi.boo>
| -rw-r--r-- | flake.lock | 16 | ||||
| -rw-r--r-- | flake.nix | 20 |
2 files changed, 9 insertions, 27 deletions
@@ -1,20 +1,5 @@ { "nodes": { - "nix-filter": { - "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1742707865, @@ -33,7 +18,6 @@ }, "root": { "inputs": { - "nix-filter": "nix-filter", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" } @@ -4,7 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - nix-filter.url = "github:numtide/nix-filter"; # NOTE: This is not necessary for end users # You can omit it with `inputs.rust-overlay.follows = ""` @@ -18,7 +17,6 @@ { self, nixpkgs, - nix-filter, rust-overlay, }: let @@ -50,16 +48,16 @@ pname = "niri"; version = self.shortRev or self.dirtyShortRev or "unknown"; - src = nix-filter.lib.filter { - root = self; - include = [ - "niri-config" - "niri-ipc" - "niri-visual-tests" - "resources" - "src" - ./Cargo.lock + src = lib.fileset.toSource { + root = ./.; + fileset = lib.fileset.unions [ + ./niri-config + ./niri-ipc + ./niri-visual-tests + ./resources + ./src ./Cargo.toml + ./Cargo.lock ]; }; |