diff --git a/pkgs/by-name/gpodder-adaptive/package.nix b/pkgs/by-name/gpodder-adaptive/package.nix index 2d1e1173e..2d167b113 100644 --- a/pkgs/by-name/gpodder-adaptive/package.nix +++ b/pkgs/by-name/gpodder-adaptive/package.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - fetchpatch, gitUpdater, gpodder, libhandy, @@ -9,24 +8,14 @@ let self = gpodder.overridePythonAttrs (upstream: rec { pname = "gpodder-adaptive"; - version = "3.11.4+1"; + version = "3.11.5+1"; src = fetchFromGitHub { owner = "gpodder"; repo = "gpodder"; rev = "adaptive/${version}"; - hash = "sha256-ydbFwX44Pg2p4HknEQ7B74ZpRVILxxBxhjWeTKY9odc="; + hash = "sha256-LLrgRGQB6F3AioUsgHWYBUinGQppfFdipK1rfxbsuAs="; }; - patches = (upstream.patches or []) ++ [ - (fetchpatch { - # necessary for Python 3.12 compatibility; remove when upgrading past 3.11.4. - # TODO: merge into nixpkgs' gpodder expression - name = "Replace the removed imp module with importlib"; - url = "https://github.com/gpodder/gpodder/commit/dd9b594d24a541c0f1d3b096e47b6d7f1c11ca7e.patch"; - hash = "sha256-jAe3onmuPdwBhspWHhMf2Gy1hj5GiGoZjkpLAAy/ZIE="; - }) - ]; - # nixpkgs `gpodder` uses the `format = "other"` Makefile build flow. # upstream specifies a Makefile, and it's just `setup.py` calls plus a few other deps. # however, it calls the build Python, which breaks for cross compilation.