diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-04-23 13:33:09 +0200 |
commit | 030f6f489fe9544f35ebaf95135acd1dd67ce63f (patch) | |
tree | f1d5d1f1b68de81daec6f05d032a0410a475d960 /gnu/packages/guile-xyz.scm | |
parent | 95c14929a7fbd3c55c5e8756953c2f257625e2b7 (diff) | |
parent | 938df0de739aa13c2fb483f440ec1db281a52aaa (diff) | |
download | guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar guix-030f6f489fe9544f35ebaf95135acd1dd67ce63f.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
etc/news.scm
gnu/local.mk
gnu/packages/bootloaders.scm
gnu/packages/linphone.scm
gnu/packages/linux.scm
gnu/packages/tls.scm
gnu/system.scm
Diffstat (limited to 'gnu/packages/guile-xyz.scm')
-rw-r--r-- | gnu/packages/guile-xyz.scm | 68 |
1 files changed, 31 insertions, 37 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5be56ba9f7..1b3cde693e 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -417,6 +417,7 @@ and then run @command{scm example.scm}.") library for GNU Guile based on the actor model. Note that 8sync is only available for Guile 2.2.") + (properties '((upstream-name . "8sync"))) (license license:lgpl3+))) (define-public guile-daemon @@ -2250,11 +2251,6 @@ is no support for parsing block and inline level HTML.") (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-finding-guile - (lambda _ - (substitute* "configure" - (("2\\.0") "3.0 2.2 2.0")) - #t)) (add-before 'check 'adjust-tests (lambda _ (substitute* "tests/job-specifier.scm" @@ -3242,42 +3238,40 @@ over, or update a value in arbitrary data structures.") (license license:gpl3+)))) (define-public guile-xapian - (let ((commit "ede26b808188eb4d14c6b4181c933dfc09c0a22e") - (revision "0")) - (package - (name "guile-xapian") - (version (git-version "0" revision commit)) - (home-page "https://git.systemreboot.net/guile-xapian") - (source - (origin - (method git-fetch) - (uri (git-reference (url home-page) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "07a9fmqi3pm6mbbpzi01mjwrqwnljs2rnc3603sq49dz4lf663gb")))) - (build-system gnu-build-system) - (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings - (inputs - `(("guile" ,guile-2.2) - ("xapian" ,xapian) - ("zlib" ,zlib))) - (native-inputs - `(("autoconf" ,autoconf) - ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("swig" ,swig))) - (synopsis "Guile bindings for Xapian") - (description "@code{guile-xapian} provides Guile bindings for Xapian, a + (package + (name "guile-xapian") + (version "0.1.0") + (home-page "https://git.systemreboot.net/guile-xapian") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "16k61f1jn3g48jaf3730b9l0izr5j933jzyri73nmcnjd09gm35i")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings + (inputs + `(("guile" ,guile-2.2) + ("xapian" ,xapian) + ("zlib" ,zlib))) + (native-inputs + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config) + ("swig" ,swig))) + (synopsis "Guile bindings for Xapian") + (description "@code{guile-xapian} provides Guile bindings for Xapian, a search engine library. Xapian is a highly adaptable toolkit which allows developers to easily add advanced indexing and search facilities to their own applications. It has built-in support for several families of weighting models and also supports a rich set of boolean query operators.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public guile3.0-xapian (package |