summary refs log tree commit diff
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-03-13 23:16:15 +0100
committerGitHub <noreply@github.com>2019-03-13 23:16:15 +0100
commitc1d70b580180f62a808314411ba3a3b043c4ceff (patch)
treee709fa76fae8cbde1225532f63f8922b764e2def
parent9179a3a406f77fe25f32f1ef7847392a889f8363 (diff)
parentb771cdea35b629bcfa6d66fc35bdaac8ffe99069 (diff)
downloadnixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar.gz
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar.bz2
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar.lz
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar.xz
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.tar.zst
nixpkgs-c1d70b580180f62a808314411ba3a3b043c4ceff.zip
Merge pull request #57001 from jtojnar/almanah
almanah: init at 0.11.1
-rw-r--r--pkgs/applications/misc/almanah/default.nix32
-rw-r--r--pkgs/development/libraries/libcryptui/default.nix28
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 64 insertions, 0 deletions
diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix
new file mode 100644
index 00000000000..4997a9c7f2a
--- /dev/null
+++ b/pkgs/applications/misc/almanah/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, libxml2, desktop-file-utils, wrapGAppsHook, evolution-data-server, gtkspell3, gpgme, libcryptui
+, glib, gtk3, gtksourceview3, sqlite, cairo, atk, gcr, gnome3 }:
+
+stdenv.mkDerivation rec {
+  pname = "almanah";
+  version = "0.11.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1g0fyykq8bs3x1xqc0l0bk9zazcrxja784m68myymv1zfqqnp9h0";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool libxml2 desktop-file-utils wrapGAppsHook ];
+
+  buildInputs = [ glib gtk3 gtksourceview3 sqlite cairo atk gcr gtkspell3 evolution-data-server gnome3.evolution gpgme libcryptui ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none"; # it is quite odd
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Small GTK application to allow to keep a diary of your life";
+    homepage = https://wiki.gnome.org/Apps/Almanah_Diary;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = gnome3.maintainers;
+  };
+}
diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix
new file mode 100644
index 00000000000..fef8e7f510d
--- /dev/null
+++ b/pkgs/development/libraries/libcryptui/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gnome3, gtk3, gnupg20, gpgme, dbus-glib, libgnome-keyring }:
+
+stdenv.mkDerivation rec {
+  pname = "libcryptui";
+  version = "3.12.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib gtk3 gnupg20 gpgme dbus-glib libgnome-keyring ];
+  propagatedBuildInputs = [ dbus-glib ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Interface components for OpenPGP";
+    homepage = https://gitlab.gnome.org/GNOME/libcryptui;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ab2c7f2c51..e8cf2cf8db9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -505,6 +505,8 @@ in
 
   aldo = callPackage ../applications/radio/aldo { };
 
+  almanah = callPackage ../applications/misc/almanah { };
+
   amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
 
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
@@ -3752,6 +3754,8 @@ in
 
   libcroco = callPackage ../development/libraries/libcroco { };
 
+  libcryptui = callPackage ../development/libraries/libcryptui { };
+
   libsmi = callPackage ../development/libraries/libsmi { };
 
   lesspipe = callPackage ../tools/misc/lesspipe { };