diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-06 06:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-06 06:01:30 +0000 |
| commit | 035a649a67c56b9d16be608e8bb87b9c215b33da (patch) | |
| tree | cdb7f52fa90bd89fe14628303333ba524f1c49be /pkgs/top-level | |
| parent | 2622221e95392f62f81ae60c35504e338e9ac2cf (diff) | |
| parent | bf78e6a54601fc74d8d27fb918a420c84fb6f5b3 (diff) | |
| download | nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.gz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.bz2 nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.lz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.xz nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.tar.zst nixlib-035a649a67c56b9d16be608e8bb87b9c215b33da.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/qt5-packages.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4c088f84d056..029b74d824af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10610,6 +10610,8 @@ self: super: with self; { pymicrobot = callPackage ../development/python-modules/pymicrobot { }; + pymiele = callPackage ../development/python-modules/pymiele { }; + pymilter = callPackage ../development/python-modules/pymilter { }; pymilvus = callPackage ../development/python-modules/pymilvus { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 2a068d5afd71..9acaacea24a4 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -142,13 +142,13 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP liblastfm = callPackage ../development/libraries/liblastfm { }; - libopenshot = callPackage ../applications/video/openshot-qt/libopenshot.nix { + libopenshot = callPackage ../development/libraries/libopenshot { stdenv = if pkgs.stdenv.isDarwin then pkgs.overrideSDK pkgs.stdenv "11.0" else pkgs.stdenv; }; packagekit-qt = callPackage ../tools/package-management/packagekit/qt.nix { }; - libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { + libopenshot-audio = callPackage ../development/libraries/libopenshot-audio { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate AGL Cocoa Foundation; }; |