From a14ffe567b4fed5d10d9e28c6bb864308ab44234 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 19 May 2018 16:47:04 -0400 Subject: [PATCH 1/2] add emmanuelrosa as maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd5c335ad1..0c3175823b0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1236,6 +1236,11 @@ github = "ElvishJerricco"; name = "Will Fancher"; }; + emmanuelrosa = { + email = "emmanuel_rosa@aol.com"; + github = "emmanuelrosa"; + name = "Emmanuel Rosa"; + }; endgame = { email = "jack@jackkelly.name"; github = "endgame"; From 3dadae4cd241961eb457543be1c01878a0dc75ae Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 19 May 2018 16:48:05 -0400 Subject: [PATCH 2/2] purple-lurch: init at 0.6.7 Adds XEP-0384: OMEMO Encryption for libpurple --- .../pidgin-plugins/purple-lurch/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 ++-- 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix new file mode 100644 index 00000000000..bcfcbee8556 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }: + +stdenv.mkDerivation rec { + name = "purple-lurch-${version}"; + version = "0.6.7"; + + src = fetchFromGitHub { + owner = "gkdr"; + repo = "lurch"; + rev = "v${version}"; + sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ]; + + dontUseCmakeConfigure = true; + + installPhase = '' + install -Dm755 -t $out/lib/purple-2 build/lurch.so + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/gkdr/lurch; + description = "XEP-0384: OMEMO Encryption for libpurple"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ emmanuelrosa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17613fbc67d..1ebedcec4fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1451,7 +1451,7 @@ with pkgs; mcrypt = callPackage ../tools/misc/mcrypt { }; mongodb-compass = callPackage ../tools/misc/mongodb-compass { }; - + mongodb-tools = callPackage ../tools/misc/mongodb-tools { }; mozlz4a = callPackage ../tools/compression/mozlz4a { @@ -1467,7 +1467,7 @@ with pkgs; }; antibody = callPackage ../shells/zsh/antibody { }; - + antigen = callPackage ../shells/zsh/antigen { }; apparix = callPackage ../tools/misc/apparix { }; @@ -17446,6 +17446,8 @@ with pkgs; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; + purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { }; + purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };