diff options
Diffstat (limited to 'guix.scm')
| -rw-r--r-- | guix.scm | 118 |
1 files changed, 7 insertions, 111 deletions
@@ -1,5 +1,5 @@ ;;; mumi - Mediocre, uh, mail interface -;;; Copyright © 2016, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2016-2020 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of mumi. ;;; @@ -24,118 +24,14 @@ (use-modules ((guix licenses) #:prefix license:) (guix packages) (guix download) - (guix git-download) (guix utils) (guix build-system gnu) (gnu packages) (gnu packages autotools) - (gnu packages base) - (gnu packages glib) (gnu packages guile) (gnu packages guile-xyz) (gnu packages mail) - (gnu packages pkg-config) - (gnu packages texinfo) - (srfi srfi-1)) - -(define-public guile-email-devel - (let ((commit "641168f09dd117f053726593811bd0e35f6cc33e") - (revision "4")) - (package (inherit guile-email) - (name "guile-email") - (version (git-version (package-version guile-email) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.systemreboot.net/guile-email") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0dpayvjqhlvny4r42gd1vrk5xaqp7vxgzfj28s2k23lraxmi9ckf")))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo)))))) - -(define-public guile-debbugs-devel - (let ((commit "fb0ae064037a38a0d526e08b4ad24c52e205edb9") - (revision "1")) - (package (inherit guile-debbugs) - (name "guile-debbugs") - (version (git-version "0.0.2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.savannah.gnu.org/git/guile-debbugs.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "195sacx2xc1mzzfljj62nfpi8mxn0rc6dabxckizjksnhb5irfwy")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) - (propagated-inputs - `(("guile-email" ,guile-email-devel))) - (inputs - `(("guile" ,guile-2.2)))))) - -(define-public mumimu - (let ((commit "ad30b5e9c85f0465aeeeac461d8c32d95775d450") - (revision "1")) - (package (inherit mu) - (name "mumimu") - (version (git-version (package-version guile-email) revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.elephly.net/software/mumimu.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1y8r8csvkyxncgpi469dir4n4sga4z9xdzc18qh5s8bk29qj689n")))) - (arguments - (substitute-keyword-arguments (package-arguments mu) - ((#:tests? anything '()) - #f) - ((#:phases phases) - `(modify-phases ,phases - (replace 'patch-configure - (lambda _ - (delete-file "autogen.sh") - (substitute* "configure.ac" - ;; Use latest Guile - (("guile-2.0") "guile-2.2")) - (substitute* '("guile/Makefile.am" - "guile/mu/Makefile.am") - (("share/guile/site/2.0/") "share/guile/site/2.2/")) - #t)) - (replace 'fix-ffi - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "guile/mumimu.scm" - (("\"libguile-mu\"") - (format #f "\"~a/lib/libguile-mumimu\"" - (assoc-ref outputs "out")))) - #t)) - (delete 'install-emacs-autoloads))) - ((#:configure-flags flags) - '("--disable-gtk" - "--disable-webkit" - "--disable-mu4e")))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("glib" ,glib "bin") - ("tzdata" ,tzdata-for-tests) - ("texinfo" ,texinfo)))))) + (gnu packages pkg-config)) (package (name "mumi") @@ -143,13 +39,13 @@ (source #f) (build-system gnu-build-system) (inputs - `(("guile-debbugs" ,guile-debbugs-devel) - ("guile-email" ,guile-email-devel) - ("guile-json" ,guile-json) - ("guile-fibers" ,guile-fibers) + `(("guile-debbugs" ,guile-debbugs) + ("guile-email" ,guile-email) + ("guile-json" ,guile-json-3) + ;("guile-fibers" ,guile-fibers) ("guile-syntax-highlight" ,guile-syntax-highlight) ("guile" ,guile-2.2) - ("mumimu" ,mumimu))) + ("mumimu" ,(@@ (gnu packages mail) mumimu)))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) |