diff --git a/pkgs/development/python-modules/paddlepaddle/default.nix b/pkgs/development/python-modules/paddlepaddle/default.nix index fe0f6519409f..49844600b25e 100644 --- a/pkgs/development/python-modules/paddlepaddle/default.nix +++ b/pkgs/development/python-modules/paddlepaddle/default.nix @@ -4,7 +4,6 @@ stdenv, buildPythonPackage, fetchurl, - fetchPypi, python, pythonOlder, pythonAtLeast, @@ -33,7 +32,7 @@ let sources = import ./sources.nix; version = sources.version; format = "wheel"; - pyShortVersion = "cp${builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; + pyShortVersion = "cp${lib.replaceStrings [ "." ] [ "" ] python.pythonVersion}"; cudaVersion = "cu${lib.replaceStrings [ "." ] [ "" ] cudaPackages.cudatoolkit.version}"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -49,25 +48,14 @@ let platform = sources.${stdenv.hostPlatform.system}.platform; - src = - if cudaSupport then - (fetchurl { - url = "https://paddle-whl.bj.bcebos.com/stable/${cudaVersion}/paddlepaddle-gpu/paddlepaddle_gpu-${version}-${pyShortVersion}-${pyShortVersion}-linux_x86_64.whl"; - inherit hash; - }) - else - (fetchPypi { - inherit - version - format - hash - platform - ; - pname = "paddlepaddle"; - dist = pyShortVersion; - python = pyShortVersion; - abi = pyShortVersion; - }); + src = fetchurl { + url = "https://paddle-whl.bj.bcebos.com/stable/${ + if cudaSupport then cudaVersion else "cpu" + }/${pname}/${ + lib.replaceStrings [ "-" ] [ "_" ] pname + }-${version}-${pyShortVersion}-${pyShortVersion}-${platform}.whl"; + inherit hash; + }; in buildPythonPackage { inherit diff --git a/pkgs/development/python-modules/paddlepaddle/sources.nix b/pkgs/development/python-modules/paddlepaddle/sources.nix index 4b1f0fbc1aef..07c098991300 100644 --- a/pkgs/development/python-modules/paddlepaddle/sources.nix +++ b/pkgs/development/python-modules/paddlepaddle/sources.nix @@ -1,38 +1,38 @@ { - version = "3.2.2"; + version = "3.3.0"; x86_64-linux = { - platform = "manylinux1_x86_64"; + platform = "linux_x86_64"; cpu = { - cp312 = "sha256-9rO3PUesyCz1RYlublwxtVp/mibcCssoq8wkBp2Tlt0="; - cp313 = "sha256-xPSFWWpobqcqsN3/yeQRePRWMUqZ1FOPXRgaAVapJ/o="; + cp312 = "sha256-PumW7ivy0rM+mGWHb7gv8Dy3uyJGzFqgAn7dapoGQOs="; + cp313 = "sha256-iImCdPXNXi9OuvVjHUwAkn2dWEZaCDh1wiS0D5k1zTk="; }; gpu = { cu126 = { - cp312 = "sha256-gY5/W2BR9+wVcPKdi5gZiHNH/t/rCv2g76rJ0E1wRt4="; - cp313 = "sha256-CRNQl+8pRVbfJX172H2KNgsAeSiX+AYHoilMcw1pPXw="; + cp312 = "sha256-rYlNNuvnK3j3th+HltQPlyeLowA648E4qkUW2a8GBOU="; + cp313 = "sha256-hb1kDryNy72pjtNaj7SJIfL3hMsx9xMIbJ67hy2JDEU="; }; cu129 = { - cp312 = "sha256-t2beVNEfz+JcesM5+i9BVNKKXIsI3zvz1VrTSd/79+c="; - cp313 = "sha256-0thm6aAGpqSLfJdI0MZKuJPn2e4CsNU5S19ohzkukSs="; + cp312 = "sha256-Ukci896/PoTmk6Za1ZzZnO5NDeN7xMgfUMJK4Jj57J0="; + cp313 = "sha256-pkNs7L3AEqGARs4iM7n5eReMHj+ZJj8LGHefXmmQNTM="; }; cu130 = { - cp312 = "sha256-70uOCNrFH9QB9G/0e5aAufBHPthJOjoJt39uprt68sE="; - cp313 = "sha256-+aNoFQgqsrN9Jtqf0uChifIAacmbDdf8JkqjOqMsFpU="; + cp312 = "sha256-yD4wdgkwRm1FdvyGAPExwpomCc4M/PC2RugBpsCUWZ8="; + cp313 = "sha256-3zmZ4mbxhC8LL/+wT9ip43F8E0iwzHjP9tm8+hYcTBE="; }; }; }; aarch64-linux = { - platform = "manylinux2014_aarch64"; + platform = "linux_aarch64"; cpu = { - cp312 = "sha256-pZ2QILoWD6f1rvyzDkpjKTkKY10aC1EfZFgTk3bAP5k="; - cp313 = "sha256-sDVpuhUaxQqnMJVcZd+lcf565x+UV0yU6L/l4JE6fZw="; + cp312 = "sha256-1GeE+enBxjIc9BTulCvXBeC6HI0XRcPdf/20mb/HE3w="; + cp313 = "sha256-LfBVU8RHRDXAAFlfN623fOUJMWGFT5AWntKTyDaLlB4="; }; }; aarch64-darwin = { platform = "macosx_11_0_arm64"; cpu = { - cp312 = "sha256-xi2rDU323il4lggy8AFaFFwjzTeUGNky3dj1RmKdH+Q="; - cp313 = "sha256-9+m8BGnRPZmSXNdmxKbO61q2BDt5DdQVzgdvu+uzkHQ="; + cp312 = "sha256-F6q2uQ2M7yzPiT9L6CzwXpBuIf6GxAo0/qZwGTfXeCs="; + cp313 = "sha256-tWeBNUsYBj9DqH89ViraWk+KQ3/iMSqxAy+omtWlTsA="; }; }; }