From 0ec60b4f791057f073aafa451395759e814ca36d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 10 Nov 2019 19:31:49 +0100
Subject: [PATCH 1/3] maintainers: add craigem

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5948944aa23..ec21dd9fafb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1401,6 +1401,12 @@
     githubId = 411324;
     name = "Carles Pagès";
   };
+  craigem = {
+    email = "craige@mcwhirter.io";
+    github = "craigem";
+    githubId = "6470493";
+    name = "Craige McWhirter";
+  };
   cransom = {
     email = "cransom@hubns.net";
     github = "cransom";

From d777bfbfae55205028fb20766e16f9c47c1ff1c0 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Fri, 1 Nov 2019 11:30:25 +0100
Subject: [PATCH 2/3] calls: init at 0.0.1

---
 .../applications/networking/calls/default.nix | 73 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/networking/calls/default.nix

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
new file mode 100644
index 00000000000..acb2a2e893c
--- /dev/null
+++ b/pkgs/applications/networking/calls/default.nix
@@ -0,0 +1,73 @@
+{ stdenv
+, fetchFromGitLab
+, meson
+, ninja
+, pkgconfig
+, libhandy
+, modemmanager
+, gtk3
+, gsound
+, libpeas
+, dbus
+, xorg
+, xvfb_run
+, libxml2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "calls";
+  version = "0.0.1";
+
+  src = fetchFromGitLab {
+    domain = "source.puri.sm";
+    owner = "Librem5";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0qjgajrq3kbml3zrwwzl23jbj6y62ccjakp667jq57jbs8af77pq";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkgconfig
+  ];
+
+  buildInputs = [
+    modemmanager
+    libhandy
+    gsound
+    gtk3
+    libhandy
+    libpeas
+    libxml2
+  ];
+
+  checkInputs = [
+    dbus
+    xvfb_run
+    xorg.xauth
+  ];
+
+  mesonFlags = [
+    "-Dgtk_doc=false"
+  ];
+
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    NO_AT_BRIDGE=1 \
+    xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
+      --config-file=${dbus.daemon}/share/dbus-1/session.conf \
+      meson test --print-errorlogs
+    runHook postCheck
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A phone dialer and call handler";
+    homepage = https://source.puri.sm/Librem5/calls;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ craigem lheckemann ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8a205aafd3..0cf03a7442b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -780,6 +780,8 @@ in
 
   bunny = callPackage ../tools/package-management/bunny { };
 
+  calls = callPackage ../applications/networking/calls { };
+
   certigo = callPackage ../tools/admin/certigo { };
 
   chezmoi = callPackage ../tools/misc/chezmoi { };

From 301eb1a494c318b5b22177743b00a959c115fbcb Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Wed, 30 Oct 2019 09:56:03 +0100
Subject: [PATCH 3/3] calls: 0.0.1 -> 2019-10-09-unstable

---
 pkgs/applications/networking/calls/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix
index acb2a2e893c..63caf836ad9 100644
--- a/pkgs/applications/networking/calls/default.nix
+++ b/pkgs/applications/networking/calls/default.nix
@@ -6,7 +6,10 @@
 , libhandy
 , modemmanager
 , gtk3
+, gom
 , gsound
+, evolution-data-server
+, desktop-file-utils
 , libpeas
 , dbus
 , xorg
@@ -15,26 +18,29 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "calls";
-  version = "0.0.1";
+  pname = "calls-unstable";
+  version = "2019-10-09";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "0qjgajrq3kbml3zrwwzl23jbj6y62ccjakp667jq57jbs8af77pq";
+    rev = "4b4cfa04266ebbe2f3da5abd9624ea07aa159fea";
+    sha256 = "0qvnddjpkh6gsywzdi24lmjlbwi0q54m1xa6hiaf1ch1j7kcv8fr";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkgconfig
+    desktop-file-utils
   ];
 
   buildInputs = [
     modemmanager
     libhandy
+    evolution-data-server
+    gom
     gsound
     gtk3
     libhandy