colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #160870 from fabaff/fix-jrnl

Browse Source 
jrnl: 2.8.3 -> 2.8.4
This commit is contained in:
Fabian Affolter 2022-02-20 12:24:02 +01:00 committed by GitHub
commit 6282a13260
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/applications/misc/jrnl/default.nix
View File

@ -1,26 +1,20 @@
{ lib { lib
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, python3 , python3
}: }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "jrnl"; pname = "jrnl";
version = "2.8.3"; version = "2.8.4";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jrnl-org"; owner = "jrnl-org";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+kPr7ndY6u1HMw6m0UZJ5jxVIPNjlTfQt7OYEdZkHBE="; sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc=";
}; };
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
'';
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python3.pkgs; [
poetry-core poetry-core
]; ];
@ -45,14 +39,10 @@ python3.pkgs.buildPythonApplication rec {
toml toml
]; ];
patches = [ postPatch = ''
# Switch to poetry-core, https://github.com/jrnl-org/jrnl/pull/1359 substituteInPlace pyproject.toml \
(fetchpatch { --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"'
name = "switch-to-poetry-core.patch"; '';
url = "https://github.com/jrnl-org/jrnl/commit/a55a240eff7a167af5974a03e9de6f7b818eafd9.patch";
sha256 = "1w3gb4vasvh51nggf89fsqsm4862m0g7hr36qz22n4vg9dds175m";
})
];
preCheck = '' preCheck = ''
export HOME=$(mktemp -d); export HOME=$(mktemp -d);