rekado pushed a commit to branch core-updates in repository guix. commit 116ca65b583ba4e404289f1481dc3a3ffef1c3dd Merge: 477ee22 25133ca Author: Ricardo Wurmus <rek...@elephly.net> Date: Wed Jun 6 22:43:37 2018 +0200
Merge branch 'master' into core-updates gnu/packages/admin.scm | 23 +++++++------- gnu/packages/astronomy.scm | 25 +++++++++------- gnu/packages/crypto.scm | 9 +++--- gnu/packages/databases.scm | 4 +-- gnu/packages/debian.scm | 4 +-- gnu/packages/emulators.scm | 8 ++--- gnu/packages/engineering.scm | 30 ++++--------------- gnu/packages/games.scm | 12 ++++---- gnu/packages/gnome.scm | 16 +++++----- gnu/packages/package-management.scm | 4 +-- gnu/packages/photo.scm | 4 +-- gnu/packages/ruby.scm | 17 ++++++----- gnu/packages/scribus.scm | 60 ++++--------------------------------- gnu/packages/syncthing.scm | 10 +++---- gnu/packages/video.scm | 6 ++-- gnu/packages/vulkan.scm | 8 ++--- gnu/packages/web-browsers.scm | 5 ++-- gnu/packages/web.scm | 39 ++++++++++-------------- gnu/packages/wine.scm | 2 +- gnu/packages/xdisorg.scm | 32 ++++++++++---------- 20 files changed, 126 insertions(+), 192 deletions(-) diff --cc gnu/packages/syncthing.scm index b650bed,1da0ace..f43c517 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@@ -37,12 -37,11 +37,12 @@@ "/syncthing-source-v" version ".tar.gz")) (sha256 (base32 - "1wz6cwq3la5676z1c20sh4fykmjwhs410xzcnb2jfyzaldf57cwj")) + "0bxkm5jlj6l4gai23bg0y31brr80r9qllh1rdg29pahjn0c2b4ml")) (modules '((guix build utils))) ;; Delete bundled ("vendored") free software source code. - (snippet - '(delete-file-recursively "vendor")))) + (snippet '(begin + (delete-file-recursively "vendor") + #t)))) (build-system go-build-system) ;; The primary Syncthing executable goes to "out", while the auxiliary ;; server programs and utility tools go to "utils". This reduces the size