diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index cc2b0bafc2dc..30c70abcf82b 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.2.3"; pname = "beancount"; pyproject = true; @@ -24,21 +24,15 @@ buildPythonPackage rec { owner = "beancount"; repo = "beancount"; tag = version; - hash = "sha256-XWTgaBvB4/SONL44afvprZwJUVrkoda5XLGNxad0kec="; + hash = "sha256-WM8SM2ZHphafzXHyVi4Fo9tgsClAnmLsZKZUsf2Twmg="; }; - patches = [ - (fetchpatch2 { - name = "accept-date-range-error-message-from-py3.14"; - url = "https://salsa.debian.org/python-team/packages/beancount/-/raw/debian/sid/debian/patches/0003-Accept-date-range-error-message-from-py3.14.patch"; - hash = "sha256-wqMTGSi4Gn5VADjV4MjZhFNWB3ThUhxvLYK7sentScQ="; - }) - (fetchpatch2 { - name = "skip-ref-count-test-with-py3.14"; - url = "https://salsa.debian.org/python-team/packages/beancount/-/raw/debian/sid/debian/patches/0004-Skip-refcount-test-with-py3.14.patch"; - hash = "sha256-6P9xe15WBGaWpVYB2HfGfFHLMMmGkfnDwdjdktlSNxk="; - }) - ]; + postPatch = '' + # We don't need the python binary wrappers, since we provide them via nativeBuildInputs + substituteInPlace pyproject.toml \ + --replace-fail "'flex-bin ; sys_platform == \"linux\" or sys_platform == \"darwin\"'," "" \ + --replace-fail "'bison-bin ; sys_platform == \"linux\" or sys_platform == \"darwin\"'," "" + ''; build-system = [ meson diff --git a/pkgs/development/python-modules/fava/default.nix b/pkgs/development/python-modules/fava/default.nix index 7b70181c6588..ee8579128317 100644 --- a/pkgs/development/python-modules/fava/default.nix +++ b/pkgs/development/python-modules/fava/default.nix @@ -25,17 +25,17 @@ let src = buildNpmPackage (finalAttrs: { pname = "fava-frontend"; - version = "1.30.12"; + version = "1.30.13"; src = fetchFromGitHub { owner = "beancount"; repo = "fava"; tag = "v${finalAttrs.version}"; - hash = "sha256-krRkcahikP0ChTCXeS/3MBq4v+VmBLViqaYSSGYt6Mc="; + hash = "sha256-h4mjZIINR6RLYycGl2RFIEGuPPbJYYSg1TBGlZupCMw="; }; sourceRoot = "${finalAttrs.src.name}/frontend"; - npmDepsHash = "sha256-kZAwvyjPZUFJffYsr5917zX+0tMyydcOzfr/TDnoJKw="; + npmDepsHash = "sha256-DQQISV615wZjNbvZwmF/AGJyJJIIs3iBS1tJCNPpT/o="; makeCacheWritable = true; preBuild = '' @@ -108,6 +108,7 @@ buildPythonPackage { maintainers = with lib.maintainers; [ prince213 sigmanificient + cbrxyz ]; }; }