diff --git a/pkgs/additional/gpodder-configured/default.nix b/pkgs/additional/gpodder-configured/default.nix index 17ac4117..b62ba627 100644 --- a/pkgs/additional/gpodder-configured/default.nix +++ b/pkgs/additional/gpodder-configured/default.nix @@ -10,9 +10,7 @@ let remove-extra = static-nix-shell.mkPython3Bin { pname = "gpodder-remove-extra"; srcRoot = ./.; - pyPkgs = _ps: { - "gnome-feeds.listparser" = gnome-feeds.listparser; - }; + pyPkgs = [ "listparser" ]; pkgs = { # important for this to explicitly use `gpodder` here, because it may be overriden/different from the toplevel `gpodder`! inherit gpodder; diff --git a/pkgs/additional/gpodder-configured/gpodder-remove-extra b/pkgs/additional/gpodder-configured/gpodder-remove-extra index df57f0b3..355cf483 100755 --- a/pkgs/additional/gpodder-configured/gpodder-remove-extra +++ b/pkgs/additional/gpodder-configured/gpodder-remove-extra @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p "python3.withPackages (ps: [ gnome-feeds.listparser ])" -p gpodder +#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.listparser ])" -p gpodder from dataclasses import dataclass, field import listparser diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix index 8e6b69a7..b44e0f4a 100644 --- a/pkgs/python-packages/default.nix +++ b/pkgs/python-packages/default.nix @@ -3,6 +3,7 @@ depthcharge-tools = callPackage ./depthcharge-tools { }; feedsearch-crawler = callPackage ./feedsearch-crawler { }; fastcluster = callPackage ./fastcluster { }; + listparser = callPackage ./listparser { }; ols = callPackage ./ols { }; pa-dlna = callPackage ./pa-dlna { }; pyln-bolt7 = callPackage ./pyln-bolt7 { }; diff --git a/pkgs/python-packages/listparser/default.nix b/pkgs/python-packages/listparser/default.nix new file mode 100644 index 00000000..a8124634 --- /dev/null +++ b/pkgs/python-packages/listparser/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + python3, + requests, + six, +}: + +buildPythonPackage rec { + pname = "listparser"; + version = "0.18"; + + src = fetchPypi { + pname = "listparser"; + inherit version; + sha256 = "0hdqs1mmayw1r8yla43hgb4d9y3zqs5483vgf8j9ygczkd2wrq2b"; + }; + + propagatedBuildInputs = [ + requests + six + ]; + + checkPhase = '' + runHook preCheck + ${python3.interpreter} lptest.py + runHook postCheck + ''; + + meta = with lib; { + description = "Parser for subscription lists"; + homepage = "https://github.com/kurtmckee/listparser"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.colinsane ]; + platforms = platforms.linux; + }; +} +