| Message ID | 20201114092611.6225-2-tanguy@bioneland.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | gnu: Add astroid. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
This patch I went down a rabbit hole touching it up. On Sat, Nov 14, 2020 at 10:26:11AM +0100, Tanguy Le Carrour wrote: > * gnu/packages/mail.scm (astroid): New variable. > --- > gnu/packages/mail.scm | 60 +++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 60 insertions(+) > > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm > index fcd593c356..d2af1ce10c 100644 > --- a/gnu/packages/mail.scm > +++ b/gnu/packages/mail.scm > @@ -63,6 +63,7 @@ > #:use-module (gnu packages base) > #:use-module (gnu packages bash) > #:use-module (gnu packages bison) > + #:use-module (gnu packages boost) > #:use-module (gnu packages calendar) > #:use-module (gnu packages check) > #:use-module (gnu packages compression) > @@ -107,6 +108,7 @@ > #:use-module (gnu packages man) > #:use-module (gnu packages ncurses) > #:use-module (gnu packages networking) > + #:use-module (gnu packages ninja) > #:use-module (gnu packages openldap) > #:use-module (gnu packages onc-rpc) > #:use-module (gnu packages pcre) > @@ -114,6 +116,7 @@ > #:use-module (gnu packages perl-check) > #:use-module (gnu packages perl-web) > #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages protobuf) > #:use-module (gnu packages python) > #:use-module (gnu packages python-check) > #:use-module (gnu packages python-crypto) > @@ -703,6 +706,63 @@ mailpack. What can alterMIME do? > (license (list (license:non-copyleft "file://LICENSE") > license:bsd-3)))) > > +(define-public astroid > + (package > + (name "astroid") > + (version "0.15") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/astroidmail/astroid") > + (commit (string-append "v" version)))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3")))) I added a snippet for the test suite to adjust for gmime@3.2.3+ https://github.com/astroidmail/astroid/pull/685 > + (build-system cmake-build-system) > + (arguments > + `(#:configure-flags (list "-GNinja") > + #:phases > + (modify-phases %standard-phases > + (replace 'build > + (lambda _ > + (invoke "ninja" "-j" (number->string (parallel-job-count))))) > + (replace 'check > + (lambda _ > + (invoke "echo" "ninja" "test"))) This just echos "ninja test" but doesn't actually run anything. I changed it to run (invoke "ctest" ".") Then I added a phase to start the xorg display for the tests and another phase to work around not getting the test suite to recognize the plugin modules. > + (replace 'install > + (lambda _ > + (invoke "ninja" "install")))))) The native-inputs should have a bunch moved to regular inputs. It was also missing gnupg and w3m, needed for the test suite. I removed adwaita-icon-theme from propagated inputs, we try not to propagate icon sets. I also sorted them alphabetically. > + (native-inputs > + `(("gtkmm" ,gtkmm) > + ("gmime" ,gmime) > + ("gobject-introspection" ,gobject-introspection) > + ("webkitgtk" ,webkitgtk) > + ("pkg-config" ,pkg-config) > + ("ninja" ,ninja) > + ("ronn" ,ronn) > + ("libsass" ,libsass) > + ("libpeas" ,libpeas) > + ("boost" ,boost) > + ("glib-networking" ,glib-networking) > + ("protobuf" ,protobuf))) > + (inputs > + `(("python" ,python) > + ("notmuch" ,notmuch))) > + (propagated-inputs > + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) > + ("adwaita-icon-theme" ,adwaita-icon-theme))) > + (home-page "https://astroidmail.github.io/") > + (synopsis "GTK frontend to the notmuch mail system") > + (description > + "Astroid is a lightweight and fast Mail User Agent that provides > +a graphical interface to searching, display and composing email, > +organized in thread and tags. Astroid uses the notmuch backend for blazingly > +fast searches through tons of email. Astroid searches, displays and > +compose emails — and relies on other programs for fetching, > +syncing and sending email. ") > + (license license:gpl3+))) There's also a bit of borrowed code from geary and gmime, under the lgpl2.1+, so I added that to the license list. It is true that the entire work is under the gpl3+ but we try to be more specific if possible. > + > (define-public ripmime > ;; Upstream does not tag or otherwise provide any releases (only a version > ;; number in the source) > -- > 2.29.2 > I didn't get a chance to test it since I don't use notmuch. Patch pushed!
Hi Efraim, Thanks for the time and efforts you put into reviewing my patch! I really appreciate it! Excerpts from Efraim Flashner's message of November 17, 2020 8:37 pm: > This patch I went down a rabbit hole touching it up. > > On Sat, Nov 14, 2020 at 10:26:11AM +0100, Tanguy Le Carrour wrote: >> * gnu/packages/mail.scm (astroid): New variable. >> --- >> gnu/packages/mail.scm | 60 +++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 60 insertions(+) >> >> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm >> index fcd593c356..d2af1ce10c 100644 >> --- a/gnu/packages/mail.scm >> +++ b/gnu/packages/mail.scm >> @@ -63,6 +63,7 @@ >> #:use-module (gnu packages base) >> #:use-module (gnu packages bash) >> #:use-module (gnu packages bison) >> + #:use-module (gnu packages boost) >> #:use-module (gnu packages calendar) >> #:use-module (gnu packages check) >> #:use-module (gnu packages compression) >> @@ -107,6 +108,7 @@ >> #:use-module (gnu packages man) >> #:use-module (gnu packages ncurses) >> #:use-module (gnu packages networking) >> + #:use-module (gnu packages ninja) >> #:use-module (gnu packages openldap) >> #:use-module (gnu packages onc-rpc) >> #:use-module (gnu packages pcre) >> @@ -114,6 +116,7 @@ >> #:use-module (gnu packages perl-check) >> #:use-module (gnu packages perl-web) >> #:use-module (gnu packages pkg-config) >> + #:use-module (gnu packages protobuf) >> #:use-module (gnu packages python) >> #:use-module (gnu packages python-check) >> #:use-module (gnu packages python-crypto) >> @@ -703,6 +706,63 @@ mailpack. What can alterMIME do? >> (license (list (license:non-copyleft "file://LICENSE") >> license:bsd-3)))) >> >> +(define-public astroid >> + (package >> + (name "astroid") >> + (version "0.15") >> + (source >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://github.com/astroidmail/astroid") >> + (commit (string-append "v" version)))) >> + (file-name (git-file-name name version)) >> + (sha256 >> + (base32 "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3")))) > > I added a snippet for the test suite to adjust for gmime@3.2.3+ > https://github.com/astroidmail/astroid/pull/685 This has been merged, but there's been no release yet. Is it a case where I could do a "version release", with a commit number, like for instance what is done for `emacs-atom-one-dark-theme`, to make the latest code available? If yes, should it be a different variable name, like `astroid-latest`? >> + (build-system cmake-build-system) >> + (arguments >> + `(#:configure-flags (list "-GNinja") >> + #:phases >> + (modify-phases %standard-phases >> + (replace 'build >> + (lambda _ >> + (invoke "ninja" "-j" (number->string (parallel-job-count))))) >> + (replace 'check >> + (lambda _ >> + (invoke "echo" "ninja" "test"))) > > This just echos "ninja test" but doesn't actually run anything. I > changed it to run (invoke "ctest" ".") Then I added a phase to start the > xorg display for the tests and another phase to work around not getting > the test suite to recognize the plugin modules. Shame on me!! :-( I added the "echo" to save some time, and forgot to remove it! Next time, I'll put a comment alongside it! But I thought `ninja test` was successfully running all the tests! Strange. > >> + (replace 'install >> + (lambda _ >> + (invoke "ninja" "install")))))) > > The native-inputs should have a bunch moved to regular inputs. It was > also missing gnupg and w3m, needed for the test suite. I removed > adwaita-icon-theme from propagated inputs, we try not to propagate icon > sets. I also sorted them alphabetically. The problem is that… the software is built, but does not work! I had to put back `gsettings-desktop-schemas` and `adwaita-icon-theme` back into the propagated inputs to make it work. Without the first one, it does not event start. Without the second, one cannot switch to the thread view. I'll submit a new patch for that. >> + (native-inputs >> + `(("gtkmm" ,gtkmm) >> + ("gmime" ,gmime) >> + ("gobject-introspection" ,gobject-introspection) >> + ("webkitgtk" ,webkitgtk) >> + ("pkg-config" ,pkg-config) >> + ("ninja" ,ninja) >> + ("ronn" ,ronn) >> + ("libsass" ,libsass) >> + ("libpeas" ,libpeas) >> + ("boost" ,boost) >> + ("glib-networking" ,glib-networking) >> + ("protobuf" ,protobuf))) >> + (inputs >> + `(("python" ,python) >> + ("notmuch" ,notmuch))) >> + (propagated-inputs >> + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) >> + ("adwaita-icon-theme" ,adwaita-icon-theme))) >> + (home-page "https://astroidmail.github.io/") >> + (synopsis "GTK frontend to the notmuch mail system") >> + (description >> + "Astroid is a lightweight and fast Mail User Agent that provides >> +a graphical interface to searching, display and composing email, >> +organized in thread and tags. Astroid uses the notmuch backend for blazingly >> +fast searches through tons of email. Astroid searches, displays and >> +compose emails — and relies on other programs for fetching, >> +syncing and sending email. ") >> + (license license:gpl3+))) > > There's also a bit of borrowed code from geary and gmime, under the > lgpl2.1+, so I added that to the license list. It is true that the > entire work is under the gpl3+ but we try to be more specific if > possible. Thaaaaaanks again for your time and effort!
Hi Efraim, Excerpts from Tanguy LE CARROUR's message of November 18, 2020 9:23 am: > Excerpts from Efraim Flashner's message of November 17, 2020 8:37 pm: >> This patch I went down a rabbit hole touching it up. >> […] >> The native-inputs should have a bunch moved to regular inputs. It was >> also missing gnupg and w3m, needed for the test suite. I removed >> adwaita-icon-theme from propagated inputs, we try not to propagate icon >> sets. I also sorted them alphabetically. > > The problem is that… the software is built, but does not work! > I had to put back `gsettings-desktop-schemas` and `adwaita-icon-theme` > back into the propagated inputs to make it work. > Without the first one, it does not event start. Without the second, one > cannot switch to the thread view. > > I'll submit a new patch for that. Submitted: <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=44720>
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index fcd593c356..d2af1ce10c 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -63,6 +63,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages boost) #:use-module (gnu packages calendar) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -107,6 +108,7 @@ #:use-module (gnu packages man) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages openldap) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pcre) @@ -114,6 +116,7 @@ #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) @@ -703,6 +706,63 @@ mailpack. What can alterMIME do? (license (list (license:non-copyleft "file://LICENSE") license:bsd-3)))) +(define-public astroid + (package + (name "astroid") + (version "0.15") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/astroidmail/astroid") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11cxbva9ni98gii59xmbxh4c6idcg3mg0pgdsp1c3j0yg7ix0lj3")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags (list "-GNinja") + #:phases + (modify-phases %standard-phases + (replace 'build + (lambda _ + (invoke "ninja" "-j" (number->string (parallel-job-count))))) + (replace 'check + (lambda _ + (invoke "echo" "ninja" "test"))) + (replace 'install + (lambda _ + (invoke "ninja" "install")))))) + (native-inputs + `(("gtkmm" ,gtkmm) + ("gmime" ,gmime) + ("gobject-introspection" ,gobject-introspection) + ("webkitgtk" ,webkitgtk) + ("pkg-config" ,pkg-config) + ("ninja" ,ninja) + ("ronn" ,ronn) + ("libsass" ,libsass) + ("libpeas" ,libpeas) + ("boost" ,boost) + ("glib-networking" ,glib-networking) + ("protobuf" ,protobuf))) + (inputs + `(("python" ,python) + ("notmuch" ,notmuch))) + (propagated-inputs + `(("gsettings-desktop-schemas" ,gsettings-desktop-schemas) + ("adwaita-icon-theme" ,adwaita-icon-theme))) + (home-page "https://astroidmail.github.io/") + (synopsis "GTK frontend to the notmuch mail system") + (description + "Astroid is a lightweight and fast Mail User Agent that provides +a graphical interface to searching, display and composing email, +organized in thread and tags. Astroid uses the notmuch backend for blazingly +fast searches through tons of email. Astroid searches, displays and +compose emails — and relies on other programs for fetching, +syncing and sending email. ") + (license license:gpl3+))) + (define-public ripmime ;; Upstream does not tag or otherwise provide any releases (only a version ;; number in the source)