colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

gpodder-adaptive: 3.11.4+1 -> 3.11.5+1

Browse Source
This commit is contained in:
Colin
2024-12-30 14:34:18 +00:00
parent 2b1637652a
commit ce447cf674
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/by-name/gpodder-adaptive/package.nix
View File

@@ -1,6 +1,5 @@
{ {
fetchFromGitHub, fetchFromGitHub,
fetchpatch,
gitUpdater, gitUpdater,
gpodder, gpodder,
libhandy, libhandy,
@@ -9,24 +8,14 @@
let let
self = gpodder.overridePythonAttrs (upstream: rec { self = gpodder.overridePythonAttrs (upstream: rec {
pname = "gpodder-adaptive"; pname = "gpodder-adaptive";
version = "3.11.4+1"; version = "3.11.5+1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gpodder"; owner = "gpodder";
repo = "gpodder"; repo = "gpodder";
rev = "adaptive/${version}"; 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. # 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. # 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. # however, it calls the build Python, which breaks for cross compilation.