diff --git a/wip/dianara.scm b/wip/dianara.scm index 5d87804..66bd223 100644 --- a/wip/dianara.scm +++ b/wip/dianara.scm @@ -1,4 +1,4 @@ -;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016, 2020 Efraim Flashner ;;; ;;; This file is an addendum to GNU Guix. ;;; @@ -19,17 +19,16 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build utils) #:use-module (guix download) - #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (gnu packages file) - #:use-module (gnu packages kde) - #:use-module (gnu packages qt)) + #:use-module (gnu packages qt) + #:use-module (gnu packages web)) (define-public dianara (package (name "dianara") - (version "1.4.2") + (version "1.4.3") (source (origin (method url-fetch) @@ -37,7 +36,7 @@ "mirror://savannah/dianara/dianara-v" version ".tar.gz")) (sha256 (base32 - "1flkrcm26rwsl3mdkb484sihipv9swnlwvwgd50skiarczc466z6")))) + "13qzv72qmgjm00nsh95as95n0g3nrq8c06y423in5g3c1jagsab2")))) (build-system gnu-build-system) (arguments `(#:phases @@ -49,7 +48,6 @@ (string-append "PREFIX=" out)))))))) (inputs `(("file" ,file) ; libmagic - ("qca" ,qca) ("qoauth" ,qoauth) ("qtbase" ,qtbase))) (home-page "https://jancoding.wordpress.com/dianara/") diff --git a/wip/interimap.scm b/wip/interimap.scm index 0538d61..c20c876 100644 --- a/wip/interimap.scm +++ b/wip/interimap.scm @@ -1,4 +1,4 @@ -;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019, 2020 Efraim Flashner ;;; ;;; This file is an addendum to GNU Guix. ;;; @@ -22,13 +22,14 @@ #:use-module (guix utils) #:use-module (guix build-system perl) #:use-module (gnu packages databases) + #:use-module (gnu packages mail) #:use-module (gnu packages perl) #:use-module (gnu packages tls)) (define-public interimap (package (name "interimap") - (version "0.4") + (version "0.5") (source (origin (method git-fetch) @@ -38,19 +39,28 @@ (file-name (git-file-name name version)) (sha256 (base32 - "159n09g4a11pgr6qb23i5kz1f3p5jx9fs2w8j8kqddf6cj4yk6pj")))) + "0kydn57ma6m26xwjxzfbx3l28g8kx3m1h4c9r4dkkmhfyny92hvl")))) (build-system perl-build-system) (arguments `(#:phases (modify-phases %standard-phases (delete 'configure) (delete 'build) + (add-before 'check 'prepare-for-tests + (lambda _ + (substitute* '("tests/run-all" + "tests/run") + (("^PATH.*") "") + (("doveconf") (which "doveconf")) + (("/usr/sbin/dovecot") (which "dovecot"))) + #t)) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin")) (doc (string-append out "/share/doc/" ,name)) - (perl (string-append out "/lib/perl5/site_perl/" ,(package-version perl) "/Net/IMAP"))) + (perl (string-append out "/lib/perl5/site_perl/" + ,(package-version perl) "/Net/IMAP"))) (install-file "interimap" bin) (install-file "pullimap" bin) (install-file "lib/Net/IMAP/InterIMAP.pm" perl) @@ -65,7 +75,10 @@ ,(map (lambda (i) (string-append (assoc-ref inputs i) "/lib/perl5/site_perl/" ,(package-version perl))) - '("perl-conf-libconfig" "perl-dbd-sqlite" "perl-dbi" "perl-net-ssleay")))) + '("perl-conf-libconfig" + "perl-dbd-sqlite" + "perl-dbi" + "perl-net-ssleay")))) #t) ;(let* ((out (assoc-ref outputs "out")) ; (bin (string-append out "/bin/")) @@ -76,12 +89,14 @@ ; (find-files bin "\\.*$")) ; #t) ))) - #:tests? #f)) ; no tests + #:tests? #f)) ; dovecot tries to create /var/lib/dovecot (inputs `(("perl-conf-libconfig" ,perl-conf-libconfig) ("perl-dbd-sqlite" ,perl-dbd-sqlite) ("perl-dbi" ,perl-dbi) ("perl-net-ssleay" ,perl-net-ssleay))) + (native-inputs + `(("dovecot" ,dovecot))) (home-page "https://guilhem.org/interimap/") (synopsis "Fast bidirectional synchronization for QRESYNC-capable IMAP servers") (description @@ -91,8 +106,8 @@ mailbox and deliver them to an SMTP session.") (license license:gpl3+))) (define-public interimap-git - (let ((commit "67e0d741f21bd589a2cbb4d23f07f5fb5eae889b") - (revision "2")) + (let ((commit "ea57a0ab32b0863cfa1209423a5b4c8dd195f803") + (revision "1")) (package (inherit interimap) (name "interimap-git") @@ -106,7 +121,7 @@ mailbox and deliver them to an SMTP session.") (file-name (git-file-name "interimap" version)) (sha256 (base32 - "0h38jq1hjjwhh0crm9nf01f5dk5xl4lxaiz6bb0324q58llqviki")))) + "0wrlkypiqkarzyg0lvl9gza4zpk2vcapbzq9mywbd9fl232i0gxx")))) (arguments (substitute-keyword-arguments (package-arguments interimap) ((#:tests? _ #t) #f) ; tests require running dovecot service diff --git a/wip/mastodon.scm b/wip/mastodon.scm index 9a73b17..3c0415b 100644 --- a/wip/mastodon.scm +++ b/wip/mastodon.scm @@ -76,14 +76,14 @@ news readers & pine, with an emphasis on getting to 'timeline zero'.") (define-public python-mastodon-py (package (name "python-mastodon-py") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (pypi-uri "Mastodon.py" version)) (sha256 (base32 - "0mypfz5k1phn7b2fk362w8zqh2wi3czf58g4zik64n17r8viww40")))) + "1vikvkzcij2gd730cssigxi38vlmzqmwdy58r3y2cwsxifnxpz9a")))) (build-system python-build-system) (propagated-inputs `(("python-blurhash" ,python-blurhash) @@ -220,7 +220,7 @@ news readers & pine, with an emphasis on getting to 'timeline zero'.") (define-public granite (package (name "granite") - (version "5.3.0") + (version "5.3.1") (source (origin (method git-fetch) @@ -230,7 +230,7 @@ news readers & pine, with an emphasis on getting to 'timeline zero'.") (file-name (git-file-name name version)) (sha256 (base32 - "1gvrk8gh959bmq8w0kaym7sx13v763lk8x5hck00msgmyrsarfwa")))) + "12f1n07cjlc7czf642ak6964wl4fsgakc39nnmiba22z5aahfpz9")))) (build-system meson-build-system) (arguments '(#:phases diff --git a/wip/pipx.scm b/wip/pipx.scm new file mode 100644 index 0000000..99411f0 --- /dev/null +++ b/wip/pipx.scm @@ -0,0 +1,104 @@ +;;; Copyright © 2020 Efraim Flashner +;;; +;;; This file is an addendum to GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (wip pipx) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix download) + #:use-module (guix packages) + ;#:use-module (guix utils) + #:use-module (guix build-system python) + #:use-module (gnu packages check) + #:use-module (gnu packages python-xyz) + ) + +(define-public pipx + (package + (name "pipx") + (version "0.15.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pipx" version)) + (sha256 + (base32 + "0bmpri17phgziqhasp332ygiaa6lbw6pf6ybii1fhk7a96akmah1")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + (lambda _ + (setenv "PYTHONPATH" (string-append (getcwd) "/tests:" (getenv "PYTHONPATH"))) + (invoke "python3" "-m" "unittest" "tests.test_pipx.PipxStaticTests")))))) + (propagated-inputs + `(("python-argcomplete" ,python-argcomplete) + ("python-userpath" ,python-userpath))) + (home-page "https://github.com/pipxproject/pipx") + (synopsis + "Install and run Python applications in isolated environments") + (description + "pipx allows you to... +@itemize +@item Run the latest version of a CLI application from a package in a temporary +virtual environment, leaving your system untouched after it finishes. +@item Install packages to isolated virtual environments, while globally exposing +their CLI applications so you can run them from anywhere. +@item Easily list, upgrade, and uninstall packages that were installed with pipx. +@end itemize") + (license (list license:bsd-3 + license:expat)))) + +(define-public python-userpath + (package + (name "python-userpath") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "userpath" version)) + (sha256 + (base32 + "0s2ljqd40ifm8fj9jba2crjmj71jpr8rww3bbr662b3ka2k8n2yx")))) + (build-system python-build-system) + (arguments + '( + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key outputs #:allow-other-keys) + (setenv "TOXENV" "py37") + (setenv "TOX_ENV_NAME" "testenv") + (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin:" (getcwd) ":" (getenv "PATH"))) + (setenv "PYTHONPATH" (string-append (getcwd) ":" (getenv "PYTHONPATH"))) + ;(invoke "python" "-m" "pytest" "-v") + #t))) + )) + (propagated-inputs + `(("python-click" ,python-click) + ("python-distro" ,python-distro))) + (native-inputs + `( + ("python-pytest" ,python-pytest) + )) + (home-page "https://github.com/ofek/userpath") + (synopsis "Add locations to the user PATH") + (description + "@code{userpath} is a command-line tool and Python library to add custom +locations to user PATH. Only user-specific PATH is changed, avoiding the need +for elevated privileges.") + (license (list license:asl2.0 + license:expat))))