diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-25 22:07:13 -0500 |
commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/packages/jrnl.scm | |
parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
download | guix-1a5302435ff0d2822b823f5a6fe01faa7a85c629.tar.gz |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in: gnu/local.mk gnu/packages/databases.scm gnu/packages/glib.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/gnuzilla.scm gnu/packages/graphics.scm gnu/packages/gstreamer.scm gnu/packages/gtk.scm gnu/packages/linux.scm gnu/packages/machine-learning.scm gnu/packages/networking.scm gnu/packages/polkit.scm gnu/packages/pulseaudio.scm gnu/packages/rpc.scm gnu/packages/rust.scm gnu/packages/version-control.scm gnu/packages/w3m.scm
Diffstat (limited to 'gnu/packages/jrnl.scm')
-rw-r--r-- | gnu/packages/jrnl.scm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/jrnl.scm b/gnu/packages/jrnl.scm index 85d3863e05..45f9dab148 100644 --- a/gnu/packages/jrnl.scm +++ b/gnu/packages/jrnl.scm @@ -45,16 +45,16 @@ (base32 "1bjjyfc3fnsy0h299s3jj42wnigj43xdyp5ppi1cvkqbwl369935")))) (build-system python-build-system) (native-inputs - `(("behave" ,behave))) + (list behave)) (inputs - `(("python" ,python) - ("python-keyring" ,python-keyring) - ("python-pycrypto" ,python-pycrypto) - ("python-pytz" ,python-pytz) - ("python-tzlocal" ,python-tzlocal) - ("python-six" ,python-six) - ("python-dateutil" ,python-dateutil) - ("python-parsedatetime" ,python-parsedatetime))) + (list python + python-keyring + python-pycrypto + python-pytz + python-tzlocal + python-six + python-dateutil + python-parsedatetime)) (home-page "https://maebert.github.io/jrnl/") (synopsis "Personal journal application") (description |