diff options
author | Unai Zalakain <unai@gisa-elkartea.org> | 2017-08-30 16:04:29 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-09-02 11:03:49 +0200 |
commit | 3ff173ffde475f96f12b379f4ae21658e63045c1 (patch) | |
tree | 786b718e01fcf65037081d0ca70fa2fd2fe7e465 /pkgs | |
parent | 1c0a5671a1bcb657a6e171fdcc1d026dba02c5bb (diff) | |
download | nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar.gz nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar.bz2 nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar.lz nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar.xz nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.tar.zst nixlib-3ff173ffde475f96f12b379f4ae21658e63045c1.zip |
jrnl: support journal encryption by default
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/misc/jrnl/default.nix | 32 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 21 |
3 files changed, 34 insertions, 21 deletions
diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix new file mode 100644 index 000000000000..fc8b8043b94c --- /dev/null +++ b/pkgs/applications/misc/jrnl/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, python +}: + +with python.pkgs; + +buildPythonApplication rec { + pname = "jrnl"; + version = "1.9.8"; + name = "${pname}-${version}"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "d254c9c8f24dcf985b98a1d5311337c7f416e6305107eec34c567f58c95b06f4"; + }; + + propagatedBuildInputs = [ + pytz six tzlocal keyring argparse dateutil_1_5 + parsedatetime pycrypto + ]; + + # No tests in archive + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://maebert.github.io/jrnl/; + description = "A simple command line journal application that stores your journal in a plain text file"; + license = licenses.mit; + maintainers = with maintainers; [ zalakain ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 417c45b73d95..d25400b00017 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2732,6 +2732,8 @@ with pkgs; jo = callPackage ../development/tools/jo { }; + jrnl = callPackage ../applications/misc/jrnl { }; + jscoverage = callPackage ../development/tools/misc/jscoverage { }; jsduck = callPackage ../development/tools/jsduck { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 46014eee0c37..97265230beb9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11503,27 +11503,6 @@ in { inherit (self) systemd pytest; }; - jrnl = buildPythonPackage rec { - name = "jrnl-1.9.7"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/j/jrnl/${name}.tar.gz"; - sha256 = "af599a863ac298533685a7236fb86307eebc00a38eb8bb96f4f67b5d83227ec8"; - }; - - propagatedBuildInputs = with self; [ - pytz six tzlocal keyring argparse dateutil_1_5 - parsedatetime - ]; - - meta = { - homepage = http://maebert.github.io/jrnl/; - description = "A simple command line journal application that stores your journal in a plain text file"; - license = licenses.mit; - }; - }; - jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; |