diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-20 11:47:26 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-20 11:47:26 +0100 |
commit | fd26e7be2ac1ec17e0f170dc011dfaf0545c5c80 (patch) | |
tree | ae8f75943fe2c587ec466358dccb5bddc97c149e /pkgs/applications/office/bookworm | |
parent | 5767ea8955809e11fd28af774c54bef8d86b737f (diff) | |
parent | 119e4e30c8285c456a07a747bb8fce5c1c1a4b3d (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/office/bookworm')
-rw-r--r-- | pkgs/applications/office/bookworm/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index bc2f260c70303..5719a9be0a1fc 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -3,25 +3,17 @@ stdenv.mkDerivation rec { pname = "bookworm"; - version = "4f7b118281667d22f1b3205edf0b775341fa49cb"; + version = "unstable-2018-11-19"; - name = "${pname}-2018-10-21"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "babluboy"; repo = pname; - rev = version; - 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 |