diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-14 12:01:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-14 12:01:32 +0000 |
| commit | e196e68bee289193e4e133dd378addd8572dc4c5 (patch) | |
| tree | e622670eff2b4242c48ed397843a12e593ab6f52 /pkgs/top-level | |
| parent | 6b67186fe9a8c05ba3dca00cd7f3434e97c5c0f3 (diff) | |
| parent | 514826ddf2b14eb20c4fac2a19f5f8e4b5858577 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1751d52adc6a0..2b27769c8e813 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7659,7 +7659,7 @@ with pkgs; }) garage garage_0_7 garage_0_8 - garage_0_7_3 garage_0_8_1; + garage_0_7_3 garage_0_8_2; garmin-plugin = callPackage ../applications/misc/garmin-plugin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 265000111ea7e..43c0ce04e03b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2941,6 +2941,8 @@ self: super: with self; { dvc-data = callPackage ../development/python-modules/dvc-data { }; + dvc-http = callPackage ../development/python-modules/dvc-http { }; + dvc-objects = callPackage ../development/python-modules/dvc-objects { }; dvc-render = callPackage ../development/python-modules/dvc-render { }; @@ -11742,7 +11744,7 @@ self: super: with self; { torch = callPackage ../development/python-modules/torch { cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreServices; inherit (pkgs.darwin) libobjc; inherit (pkgs.llvmPackages_rocm) openmp; }; |