revert: Bad changes

ggerganov · Aug 19, 2024 · 5da9da4 · 5da9da4
1 parent 73a0ccd
commit 5da9da4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.devops/nix/package.nix b/.devops/nix/package.nix
@@ -117,13 +117,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     filter =
       name: type:
       let
-        any = builtins.any (x: x);
-        baseName = builtins.baseNameOf name;
+        noneOf = builtins.all (x: !x);
+        baseName = baseNameOf name;
       in
-      any [
-        (lib.hasSuffix ".py" name)
-        (baseName == "README.md")
-        (baseName == "pyproject.toml")
+      noneOf [
+        (lib.hasSuffix ".nix" name) # Ignore *.nix files when computing outPaths
+        (lib.hasSuffix ".md" name) # Ignore *.md changes whe computing outPaths
+        (lib.hasPrefix "." baseName) # Skip hidden files and directories
+        (baseName == "flake.lock")
       ];
     src = lib.cleanSource ../../.;
   };

diff --git a/.devops/nix/scope.nix b/.devops/nix/scope.nix
@@ -21,7 +21,6 @@ in
 
 lib.makeScope newScope (self: {
   inherit llamaVersion;
-  pp = python3.pkgs;
   gguf-py = self.callPackage ./package-gguf-py.nix {
     inherit
       buildPythonPackage