nix: replace nix-filter with lib.fileset

Co-authored-by: sodiboo <git@sodi.boo>
This commit is contained in:
Bloxx12
2025-07-13 23:28:38 +02:00
committed by Ivan Molodetskikh
parent bc0a06226a
commit 30a9c6c31b
2 changed files with 9 additions and 27 deletions
Generated
-16
View File
@@ -1,20 +1,5 @@
{ {
"nodes": { "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": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1742707865, "lastModified": 1742707865,
@@ -33,7 +18,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
} }
+9 -11
View File
@@ -4,7 +4,6 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nix-filter.url = "github:numtide/nix-filter";
# NOTE: This is not necessary for end users # NOTE: This is not necessary for end users
# You can omit it with `inputs.rust-overlay.follows = ""` # You can omit it with `inputs.rust-overlay.follows = ""`
@@ -18,7 +17,6 @@
{ {
self, self,
nixpkgs, nixpkgs,
nix-filter,
rust-overlay, rust-overlay,
}: }:
let let
@@ -50,16 +48,16 @@
pname = "niri"; pname = "niri";
version = self.shortRev or self.dirtyShortRev or "unknown"; version = self.shortRev or self.dirtyShortRev or "unknown";
src = nix-filter.lib.filter { src = lib.fileset.toSource {
root = self; root = ./.;
include = [ fileset = lib.fileset.unions [
"niri-config" ./niri-config
"niri-ipc" ./niri-ipc
"niri-visual-tests" ./niri-visual-tests
"resources" ./resources
"src" ./src
./Cargo.lock
./Cargo.toml ./Cargo.toml
./Cargo.lock
]; ];
}; };