Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9179a3a406f7
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c1d70b580180
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 6, 2019

  1. libcryptoui: init at 3.12.2

    @jtojnar
    jtojnar committed Mar 6, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8a83198 View commit details

Commits on Mar 8, 2019

  1. almanah: init at 0.11.1

    @jtojnar
    jtojnar committed Mar 8, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b771cde View commit details

Commits on Mar 13, 2019

  1. Merge pull request #57001 from jtojnar/almanah 

    almanah: init at 0.11.1
    @jtojnar
    jtojnar authored Mar 13, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c1d70b5 View commit details
Showing with 64 additions and 0 deletions.
  1. +32 −0 pkgs/applications/misc/almanah/default.nix
  2. +28 −0 pkgs/development/libraries/libcryptui/default.nix
  3. +4 −0 pkgs/top-level/all-packages.nix
32 changes: 32 additions & 0 deletions pkgs/applications/misc/almanah/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
28 changes: 28 additions & 0 deletions pkgs/development/libraries/libcryptui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};
}
4 changes: 4 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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 { };