about summary refs log tree commit diff
path: root/pkgs/applications/office/bookworm
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-11-20 11:51:11 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2018-11-20 11:51:11 +0100
commitaabf1a93bce740238b115174420af07365c4386e (patch)
tree39510c1b11b3420e0042b70e063406b0654a4e8a /pkgs/applications/office/bookworm
parentab9a7f9fba4377f671f6eb213b762cf63ab491b6 (diff)
parentfd26e7be2ac1ec17e0f170dc011dfaf0545c5c80 (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/office/bookworm')
-rw-r--r--pkgs/applications/office/bookworm/default.nix14
1 files changed, 3 insertions, 11 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