update all packages

Author: arilotter

Cargo.lock

@@ -76,9 +76,9 @@ indicatif = "0.17.5"
 tokenizers = { version = "0.20.0", default-features = false, features = [
   "onig",
 ] }
-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
-torch-sys = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
-pyo3-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "11d1ca2ef6dbd3f1e5b0986fab0a90fbb6734496" }
+tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
+torch-sys = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
+pyo3-tch = { git = "https://github.com/jquesnelle/tch-rs.git", rev = "dda507e05a776547a112b6854d1e611684f8c729" }
 #tch = { path = "../tch-rs" }
 #torch-sys = { path = "../tch-rs/torch-sys" }
 #pyo3-tch = { path = "../tch-rs/pyo3-tch" }

Cargo.toml

@@ -15,9 +15,20 @@ in
     overlays = lib.optionals cudaSupported [ inputs.nix-gl-host.overlays.default ] ++ [
       inputs.rust-overlay.overlays.default
       (final: prev: {
+        # temporary fix until https://github.com/NixOS/nixpkgs/pull/471394 is merged
+        # that lets us use `torch` instead of `torch-bin`
+        cudaPackages = prev.cudaPackages // {
+          cudnn = prev.cudaPackages.cudnn.overrideAttrs (old: {
+            patchelfFlagsArray = (old.patchelfFlagsArray or [ ]) ++ [
+              "--set-rpath"
+              "${prev.lib.getLib prev.cudaPackages.cuda_nvrtc}/lib:\$ORIGIN"
+            ];
+          });
+        };
+
+        # provide packages for uv2pip to include
         python312Packages = prev.python312Packages.override {
           overrides = pyfinal: pyprev: {
-            torch = pyfinal.torch-bin;
             flash-attn = pyfinal.callPackage ../python/flash-attn.nix { };
             liger-kernel = pyfinal.callPackage ../python/liger-kernel.nix { };
             torchtitan = pyfinal.callPackage ../python/torchtitan.nix { };

flake.lock

@@ -1,8 +1,5 @@
 {
   lib,
-  mdbook,
-  fetchFromGitHub,
-  rustPlatform,
   stdenvNoCC,
   mdbook-mermaid,
   mdbook-linkcheck,
@@ -11,37 +8,13 @@
   rustPackages,
   rustPackageNames,
 }:
-let
-  mdbook-0-4-47 = mdbook.overrideAttrs (
-    oldAttrs:
-    let
-      version = "0.4.47";
-      src = fetchFromGitHub {
-        owner = "rust-lang";
-        repo = "mdBook";
-        tag = "v${version}";
-        hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA=";
-      };
-    in
-    {
-      inherit version src;
-      cargoDeps = rustPlatform.fetchCargoVendor {
-        inherit (oldAttrs) pname;
-        inherit version src;
-        allowGitDependencies = false;
-        hash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw=";
-      };
-    }
-  );
-in
 stdenvNoCC.mkDerivation {
   __structuredAttrs = true;
 
   name = "psyche-book";
   src = ./.;
 
   nativeBuildInputs = [
-    mdbook-0-4-47
     mdbook-mermaid
     mdbook-linkcheck
   ];

nix/nixpkgs.nix

@@ -32,6 +32,7 @@ let
   # packages that we provide to the venv via nix derivations
   topLevelNixPkgs = [
     "torch"
+    "vllm"
   ]
   ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [
     "flash-attn"