From 252b4e6e86792a26e01209128fc4ba21fe40f928 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 4 Sep 2024 23:59:35 +0200 Subject: [PATCH] python312Packages.torch-bin: sort inputs correctly --- pkgs/development/python-modules/torch/bin.nix | 41 +++++++++++-------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 4ecaac16be18..216bde861e76 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -1,27 +1,34 @@ { lib, stdenv, - buildPythonPackage, - autoAddDriverRunpath, - fetchurl, python, - pythonAtLeast, + buildPythonPackage, pythonOlder, + pythonAtLeast, + fetchurl, + + # nativeBuildInputs addDriverRunpath, - callPackage, - cudaPackages, - future, - numpy, + autoAddDriverRunpath, autoPatchelfHook, + + # buildInputs + cudaPackages, + + # dependencies + filelock, + future, + jinja2, + networkx, + numpy, pyyaml, requests, setuptools, - typing-extensions, sympy, - jinja2, - networkx, - filelock, + typing-extensions, triton, + + callPackage, }: let @@ -44,8 +51,8 @@ buildPythonPackage { nativeBuildInputs = lib.optionals stdenv.isLinux [ addDriverRunpath - autoPatchelfHook autoAddDriverRunpath + autoPatchelfHook ]; buildInputs = lib.optionals stdenv.isLinux ( @@ -77,16 +84,16 @@ buildPythonPackage { ]; dependencies = [ + filelock future + jinja2 + networkx numpy pyyaml requests setuptools - typing-extensions sympy - jinja2 - networkx - filelock + typing-extensions ] ++ lib.optionals (stdenv.isLinux && stdenv.isx86_64) [ triton ]; postInstall = ''