From: Someone Serge Date: Sat, 13 Jan 2024 17:45:01 +0000 (+0000) Subject: nix: refactor the cleanSource rules X-Git-Tag: upstream/0.0.4488~2540 X-Git-Url: https://git.djapps.eu/?a=commitdiff_plain;h=7251870780e2d572dd6f239d7a0bfe438c82fa74;p=pkg%2Fggml%2Fsources%2Fllama.cpp nix: refactor the cleanSource rules --- diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix index e8534956..c25d99f0 100644 --- a/.devops/nix/package.nix +++ b/.devops/nix/package.nix @@ -115,14 +115,22 @@ effectiveStdenv.mkDerivation ( pname = "llama-cpp${pnameSuffix}"; version = llamaVersion; + # Note: none of the files discarded here are visible in the sandbox or + # affect the output hash. This also means they can be modified without + # triggering a rebuild. src = lib.cleanSourceWith { filter = name: type: - !(builtins.any (_: _) [ + let + noneOf = builtins.all (x: !x); + baseName = baseNameOf name; + in + noneOf [ (lib.hasSuffix ".nix" name) # Ignore *.nix files when computing outPaths - (name == "README.md") # Ignore *.md changes whe computing outPaths - (lib.hasPrefix "." name) # Skip hidden files and directories - ]); + (lib.hasSuffix ".md" name) # Ignore *.md changes whe computing outPaths + (lib.hasPrefix "." baseName) # Skip hidden files and directories + (baseName == "flake.lock") + ]; src = lib.cleanSource ../../.; };