diff options
author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-15 22:31:27 +0200 |
---|---|---|
committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-10-15 22:31:34 +0200 |
commit | 94c8c31bee161b6e64c3c99e8031f5532fa6a6d8 (patch) | |
tree | ed7f794f9c0f69a3cfc780e77118a6cdaf4e5560 /pkgs/applications/video | |
parent | 1d9483230a9d2d9ed8e9167cdb0f982fedc60e86 (diff) | |
parent | b78c85fff7fd91c1d326b4a07979e151b5a10411 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: - pkgs/development/python-modules/numba/default.nix
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r-- | pkgs/applications/video/anime-downloader/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/video/kazam/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/video/anime-downloader/default.nix b/pkgs/applications/video/anime-downloader/default.nix index 04833eb4e82a6..235c5c58f381a 100644 --- a/pkgs/applications/video/anime-downloader/default.nix +++ b/pkgs/applications/video/anime-downloader/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { fuzzywuzzy jsbeautifier pycryptodome - pySmartDL + pysmartdl pyqt5 requests requests-cache diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index e44949f54ba61..a2a9d8d112cd4 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1jk6khwgdv3nmagdgp5ivz3156pl0ljhf7b6i4b52w1h5ywsg9ah"; }; - nativeBuildInputs = [ gobject-introspection python3Packages.distutils_extra intltool wrapGAppsHook ]; + nativeBuildInputs = [ gobject-introspection python3Packages.distutils-extra intltool wrapGAppsHook ]; buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base |