diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-07-09 16:26:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-07-09 16:26:38 +0200 |
| commit | 205fd4226592cc83fd4c0885a3e4c9c400efabb5 (patch) | |
| tree | 914931b17da02877a482e45e3310d767bc2c2433 /pkgs/development/python-modules/torch/default.nix | |
| parent | python3Packages.clustershell: remove blocking test (diff) | |
| parent | Merge branch 'release-23.11' into staging-next-23.11 (diff) | |
| download | nixpkgs-origin/release-23.11.tar.gz | |
Merge #325769: staging-next-23.11 iteration 10origin/release-23.11origin/nixos-23.11-smallorigin/nixos-23.11
...into release-23.11
A bit late roundup of what's been staged during June.
Most likely we'll only ever make binaries for *-linux.
(darwin people hopefully use the darwin channel, so they'll get the older binaries)
Diffstat (limited to 'pkgs/development/python-modules/torch/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/torch/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 70b71c8cdf88..36b1ada5ae30 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -145,7 +145,23 @@ in buildPythonPackage rec { hash = "sha256-xUj77yKz3IQ3gd/G32pI4OhL3LoN1zS7eFg0/0nZp5I="; }; - patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + patches = [ + (fetchpatch { + name = "CVE-2024-31580.patch"; + url = "https://github.com/pytorch/pytorch/commit/b5c3a17c2c207ebefcb85043f0cf94be9b2fef81.patch"; + hash = "sha256-UR9PesE+t7ekVh4cJlrCgFULLFgqZjWhgr3jFP+vuEQ="; + }) + (fetchpatch { + name = "CVE-2024-31583.patch"; + url = "https://github.com/pytorch/pytorch/commit/9c7071b0e324f9fb68ab881283d6b8d388a4bcd2.patch"; + hash = "sha256-TtiB9d8VQ5dXXOHyq4N45uFW5csmxHsF6naPH4IrKlc="; + }) + (fetchpatch { + name = "CVE-2024-31584.patch"; + url = "https://github.com/pytorch/pytorch/commit/7c35874ad664e74c8e4252d67521f3986eadb0e6.patch"; + hash = "sha256-4IsdRfL0B+Rown4xqra8taqqOXf8NKCtSN9sPrOPQV8="; + }) + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ # pthreadpool added support for Grand Central Dispatch in April # 2020. However, this relies on functionality (DISPATCH_APPLY_AUTO) # that is available starting with macOS 10.13. However, our current |