diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix index e20ea15fb424..9dc0fcad61b4 100644 --- a/pkgs/by-name/fa/fava/package.nix +++ b/pkgs/by-name/fa/fava/package.nix @@ -8,17 +8,17 @@ let src = buildNpmPackage (finalAttrs: { pname = "fava-frontend"; - version = "1.30.6"; + version = "1.30.7"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; tag = "v${finalAttrs.version}"; - hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM="; + hash = "sha256-gO6eJIFp/yWAXFWhUcqkkfk2pA8/vyTxgPRPBmv4a6Q="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4="; + npmDepsHash = "sha256-cXIhEzYFpLOxUEY7lhTWW7R3/ptkx7hB9K92Fd2m1Ng="; makeCacheWritable = true; preBuild = '' @@ -34,7 +34,7 @@ let in python3Packages.buildPythonApplication { pname = "fava"; - version = "1.30.6"; + inherit (src) version; pyproject = true; inherit src; @@ -78,10 +78,6 @@ python3Packages.buildPythonApplication { SNAPSHOT_IGNORE = lib.versions.major python3Packages.beancount.version == "2"; }; - preCheck = '' - export HOME=$TEMPDIR - ''; - meta = { description = "Web interface for beancount"; mainProgram = "fava"; diff --git a/pkgs/development/python-modules/beangulp/default.nix b/pkgs/development/python-modules/beangulp/default.nix index 6299ca35159a..d051c0bc622b 100644 --- a/pkgs/development/python-modules/beangulp/default.nix +++ b/pkgs/development/python-modules/beangulp/default.nix @@ -6,6 +6,7 @@ chardet, click, fetchFromGitHub, + fetchpatch2, lxml, petl, python-magic, @@ -25,6 +26,13 @@ buildPythonPackage rec { hash = "sha256-h7xLHwEyS+tOI7v6Erp12VfVnxOf4930++zghhC3in4="; }; + patches = [ + (fetchpatch2 { + url = "https://github.com/beancount/beangulp/commit/254bfb38ffed049ef8f3041bfaf01b3f5a8aa771.patch?full_index=1"; + hash = "sha256-ojysT23K0xmFafzTnRZiHkLS2ioDR/tVK02mfF7N9so="; + }) + ]; + build-system = [ setuptools ]; dependencies = [