diff options
Diffstat (limited to 'km-packages/misc.scm')
| -rw-r--r-- | km-packages/misc.scm | 93 |
1 files changed, 14 insertions, 79 deletions
diff --git a/km-packages/misc.scm b/km-packages/misc.scm index 4332597..f625847 100644 --- a/km-packages/misc.scm +++ b/km-packages/misc.scm @@ -1,6 +1,6 @@ ;;; misc.scm --- miscellaneous Guix packages ;;; -;;; Copyright © 2019 Kyle Meyer <kyle@kyleam.com> +;;; Copyright © 2019-2022 Kyle Meyer <kyle@kyleam.com> ;;; ;;; This file is NOT part of GNU Guix. ;;; @@ -20,98 +20,33 @@ (define-module (km-packages misc) #:use-module (gnu packages) - #:use-module (gnu packages check) - #:use-module (gnu packages python) - #:use-module (gnu packages python-crypto) - #:use-module (gnu packages python-web) - #:use-module (gnu packages python-xyz) #:use-module (gnu packages version-control) - #:use-module ((guix build utils) - #:select (with-directory-excursion)) - #:use-module (guix build-system gnu) #:use-module (guix build-system python) #:use-module (guix download) - #:use-module (guix git-download) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) -(define-public tojson +(define-public patatt-latest (package - (name "tojson") - (version "0.2") + (inherit patatt) + (version "0.6.2") (source (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/woky/tojson")) - (commit (string-append "v" version)))) - (file-name (string-append name "-" version "-checkout")) + (method url-fetch) + (uri (pypi-uri "patatt" version)) (sha256 - (base32 - "18qpwqp1aymlacnaa01kk26zrhdwrypbkrk1i3f182d8h15fghcd")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (mkdir-p bin) - (install-file "tojson" bin)) - #t)) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (path (getenv "PYTHONPATH"))) - (wrap-program (string-append out "/bin/tojson") - `("PYTHONPATH" ":" prefix (,path)))) - #t))))) - (inputs - `(("python" ,python) - ("python-pyyaml" ,python-pyyaml))) - (home-page "https://github.com/woky/tojson") - (synopsis "todo") - (description "todo") - (license license:gpl3))) + (base32 "0sy732xmjvrbdw982c0ffynwhx7515czwjf2vlci1swblpi2m8ar")))))) -(define-public patatt +(define-public b4-latest (package - (name "patatt") - (version "0.4.8") + (inherit b4) + (version "0.10.1") (source (origin (method url-fetch) - (uri (pypi-uri "patatt" version)) + (uri (pypi-uri "b4" version)) (sha256 - (base32 "1jj3c2rc5lzgsk3x2bq1295g7h59y9y8vi9a0gzqh3aqka00zqak")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; No tests. + (base32 "0i5lyvz7l0nkrgsqma2qpndwvr52wnq9jm8d3ai3dq5kca79ci6c")))) (propagated-inputs - `(("python-pynacl" ,python-pynacl))) - (home-page "https://git.kernel.org/pub/scm/utils/patatt/patatt.git") - (synopsis "Tool for cryptographic patch attestation ") - (description "TODO") - ;; TODO: It's actually MIT-Zero. - (license license:expat))) - -(define-public b4-dev - (let ((commit "7ed8a3cafd5f3ba5b4e914b495bb3035428e2d45")) - (package - (inherit b4) - (name "b4-dev") - (version (string-append "0.6.2-" (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.kernel.org/pub/scm/utils/b4/b4.git") - (commit commit))) - (sha256 - (base32 "1z9a4cas4s06hgfm678g49mmp9y4fa3rz17wxmvxrm98rphgki9f")))) - (inputs `(("patatt" ,patatt) - ,@(package-inputs b4)))))) + (modify-inputs (package-propagated-inputs b4) + (replace "patatt" patatt-latest))))) |