From b551d2c4c4f2c02d8873769fa5c3f483b4a2c096 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Tue, 14 Nov 2023 14:21:38 +0100 Subject: [PATCH 1/2] python3Packages.livestreamer: drop Project appears unmaintained. Last upstream release was on 2015-05-02, and their last commit was on 2016-02-02. Nixpkgs includes 'streamlink' in the top level, which is a currently maintained fork of livestreamer. --- .../python-modules/livestreamer/default.nix | 38 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 pkgs/development/python-modules/livestreamer/default.nix diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix deleted file mode 100644 index c7c4b06a9746..000000000000 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPyPy -, makeWrapper -, rtmpdump -, pycrypto -, requests -}: - -buildPythonPackage rec { - pname = "livestreamer"; - version = "1.12.2"; - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "chrippa"; - repo = "livestreamer"; - rev = "v${version}"; - hash = "sha256-PqqyBh+oMmu7Ynly3fqx/+6mQYX+6SpI0Okj2O+YLz0="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - propagatedBuildInputs = [ rtmpdump pycrypto requests ]; - - postInstall = '' - wrapProgram $out/bin/livestreamer --prefix PATH : ${lib.makeBinPath [ rtmpdump ]} - ''; - - meta = with lib; { - homepage = "http://livestreamer.tanuki.se"; - description = "Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice"; - license = licenses.bsd2; - maintainers = with maintainers; [ ]; - }; - -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 24ffa5b35136..f8d238bd7457 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -224,6 +224,7 @@ mapAliases ({ lazy_imports = lazy-imports; # added 2023-10-13 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 line_profiler = line-profiler; # added 2023-11-04 + livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 313c9687e354..0d9cbbfee845 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6376,8 +6376,6 @@ self: super: with self; { livereload = callPackage ../development/python-modules/livereload { }; - livestreamer = callPackage ../development/python-modules/livestreamer { }; - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; lizard = callPackage ../development/python-modules/lizard { }; From 8d640bcc656f18253ba0843dfc57b7789924b756 Mon Sep 17 00:00:00 2001 From: Dee Anzorge Date: Tue, 14 Nov 2023 14:27:14 +0100 Subject: [PATCH 2/2] python3Packages.livestreamer-curses: drop 'livestreamer' itself has been removed from Nixpkgs. Additionally, livestreamer-curses has seen no commits since 2015, and appears unmaintained. --- .../livestreamer-curses/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/livestreamer-curses/default.nix diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix deleted file mode 100644 index 213caaf4fb30..000000000000 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, isPyPy -, livestreamer -}: - -buildPythonPackage rec { - pname = "livestreamer-curses"; - version = "1.5.2"; - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "gapato"; - repo = "livestreamer-curses"; - rev = "v${version}"; - hash = "sha256-Pi0PIOUhMMAWft9ackB04IgF6DyPrXppNqyVjozIjN4="; - }; - - propagatedBuildInputs = [ livestreamer ]; - - meta = with lib; { - homepage = "https://github.com/gapato/livestreamer-curses"; - description = "Curses frontend for livestreamer"; - license = licenses.mit; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index f8d238bd7457..0aaadc9ba368 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -225,6 +225,7 @@ mapAliases ({ lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 line_profiler = line-profiler; # added 2023-11-04 livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 + livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 logilab_common = logilab-common; # added 2022-11-21 loo-py = loopy; # added 2022-05-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0d9cbbfee845..87d99e51a9a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6376,8 +6376,6 @@ self: super: with self; { livereload = callPackage ../development/python-modules/livereload { }; - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - lizard = callPackage ../development/python-modules/lizard { }; llfuse = callPackage ../development/python-modules/llfuse {