Merge staging-next into staging

2 files changed, 15 insertions, 21 deletions

diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix
index b767f7d3b1d15..4408af7f45cce 100644
--- a/pkgs/applications/office/bookworm/default.nix
+++ b/pkgs/applications/office/bookworm/default.nix
@@ -3,23 +3,15 @@
 
 stdenv.mkDerivation rec {
   pname = "bookworm";
-  version = "unstable-2018-10-21";
+  version = "unstable-2018-11-19";
 
   src = fetchFromGitHub {
     owner = "babluboy";
     repo = pname;
-    rev = "4f7b118281667d22f1b3205edf0b775341fa49cb";
-    sha256 = "0bcyim87zk4b4xmgfs158lnds3y8jg7ppzw54kjpc9rh66fpn3b9";
+    rev = "4c3061784ff42151cac77d12bf2a28bf831fdfc5";
+    sha256 = "0yrqxa60xlvz249kx966z5krx8i7h17ac0hjgq9p8f0irzy5yp0n";
   };
 
-  # See: https://github.com/babluboy/bookworm/pull/220
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/worldofpeace/bookworm/commit/b2faf685c46b95d6a2d4ec3725e4e4122b61e99a.patch";
-      sha256 = "14az86cj5j65hngfflrp1rmnrkdrhg2a8pl7www3jgfwasxay975";
-    })
-  ];
-
   nativeBuildInputs = [
     bash
     gobjectIntrospection
diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index 358bfc380771e..85dfd024d5011 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitLab
 , pkgconfig
 , intltool
 , automake111x
@@ -10,34 +10,36 @@
 , python
 }:
 
-let version = "20170425";
+let version = "unstable-2018-03-25";
 
 in stdenv.mkDerivation {
   name = "planner-${version}";
 
-  src = fetchgit {
-    url = https://gitlab.gnome.org/GNOME/planner.git;
-    rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6";
-    sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "planner";
+    rev = "2a2bf11d96a7f5d64f05c9053661baa848e47797";
+    sha256 = "1bhh05kkbnhibldc1fc7kv7bwf8aa1vh4q379syqd3jbas8y521g";
   };
 
-  buildInputs = with gnome2; [
+  nativeBuildInputs = with gnome2; [
     pkgconfig
     intltool
     automake111x
     autoconf
     libtool
-
     gnome-common
     gtk-doc
+    scrollkeeper
+  ];
 
+  buildInputs = with gnome2; [
     GConf
     gtk
     libgnomecanvas
     libgnomeui
     libglade
-    scrollkeeper
-
     libxslt
     python
   ];