summary refs log tree commit diff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-07-20 18:30:13 +0200
committerGitHub <noreply@github.com>2021-07-20 18:30:13 +0200
commit65e67a44294355b108b0d74059d1f730d49419e4 (patch)
tree28c3c9c43398271eeb45ec7d484b566fe5b02222
parent528e90adf2e047a4b7fcc8f0208863dc64d46105 (diff)
parent835dedfdbd175f343a1fac87101b9fbb2e435bab (diff)
downloadnixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar.gz
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar.bz2
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar.lz
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar.xz
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.tar.zst
nixpkgs-65e67a44294355b108b0d74059d1f730d49419e4.zip
Merge pull request #130800 from DeeUnderscore/streamlink-2.2.0
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/applications/video/streamlink/default.nix8
2 files changed, 10 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7a36b76f97a..b2ac3731b1a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2469,6 +2469,12 @@
     githubId = 452652;
     name = "Kosyrev Serge";
   };
+  DeeUnderscore = {
+    email = "d.anzorge@gmail.com";
+    github = "DeeUnderscore";
+    githubId = 156239;
+    name = "D Anzorge";
+  };
   delan = {
     name = "Delan Azabani";
     email = "delan@azabani.com";
diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index d7ade6899dc..fde2833c98c 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "streamlink";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = version;
-    sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm";
+    sha256 = "1323v1pavmbb2vk3djdkxd8j6i3yrcgrkyl2d7xwkb7nwlla1x1v";
   };
 
   checkInputs = with python3.pkgs; [
@@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/streamlink/streamlink";
     description = "CLI for extracting streams from various websites to video player of your choosing";
     longDescription = ''
-      Streamlink is a CLI utility that pipes flash videos from online
+      Streamlink is a CLI utility that pipes videos from online
       streaming services to a variety of video players such as VLC, or
       alternatively, a browser.
 
@@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication rec {
     '';
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ dezgeg zraexy ];
+    maintainers = with maintainers; [ dezgeg zraexy DeeUnderscore ];
   };
 }