diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-10 18:01:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-10 18:01:25 +0000 |
commit | 76c5dacba7a5b1409a43f6cab3e80963733981cd (patch) | |
tree | 23c3ee0e8324b446022907821e0320213c42cb52 /pkgs/tools/misc | |
parent | cac809141eb742190550d7b627116d2b612686fa (diff) | |
parent | 29d32d480c50ebcf95ed5117c881ca2717f633b4 (diff) | |
download | nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar.gz nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar.bz2 nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar.lz nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar.xz nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.tar.zst nixpkgs-76c5dacba7a5b1409a43f6cab3e80963733981cd.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/plantuml/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/yt-dlp/default.nix | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 42b673e5b18..8c4fa097ea4 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2022.1"; + version = "1.2022.2"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "sha256-oEOhf7nLVGJqoK/pyTWzF+s3OYsGcEy5pIj8obSrkRY="; + sha256 = "sha256-4LPR8gdpfebq5U/umxcFfqe7i6qJHLqhOAu7DfYzTY8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index b73b41acd88..89ca84395d5 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, brotli , ffmpeg , rtmpdump , phantomjs2 @@ -11,7 +12,6 @@ , ffmpegSupport ? true , rtmpSupport ? true , phantomjsSupport ? false -, hlsEncryptedSupport ? true , withAlias ? false # Provides bin/youtube-dl for backcompat }: @@ -20,16 +20,15 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.2.4"; + version = "2022.3.8.2"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-gbUO18+c/MBC2PWhrS0c17E8SLNsB/rxiAaW6sCn3bU="; + sha256 = "sha256-aFRleMGObOh0ULU3adXVt/WiPlIJeEl222x8y/eVSyE="; }; - propagatedBuildInputs = [ websockets mutagen ] - ++ lib.optional hlsEncryptedSupport pycryptodomex; + propagatedBuildInputs = [ brotli mutagen pycryptodomex websockets ]; # Ensure these utilities are available in $PATH: # - ffmpeg: post-processing & transcoding support @@ -52,7 +51,7 @@ buildPythonPackage rec { doCheck = false; postInstall = lib.optionalString withAlias '' - ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" + ln -s "$out/bin/yt-dlp" "$out/bin/youtube-dl" ''; meta = with lib; { @@ -68,6 +67,6 @@ buildPythonPackage rec { you can modify it, redistribute it or use it however you like. ''; license = licenses.unlicense; - maintainers = with maintainers; [ mkg20001 ]; + maintainers = with maintainers; [ mkg20001 SuperSandro2000 ]; }; } |