diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/education.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 2118ebbf6e..52051c2689 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -614,14 +614,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.49.1") + (version "6.0.2") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1aa8xnhwvbhvp7yigcdk7qdwqh59yyfknqbpn3ybgjljc22m8w5n")))) + (base32 "08q265i43bnj9syh3xlp11fr47xmzb0nma3nnwm76xq314102f0f")))) (build-system gnu-build-system) (arguments `(#:phases @@ -653,14 +653,14 @@ hours.") (define-public klavaro (package (name "klavaro") - (version "3.11") + (version "3.12") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/klavaro/klavaro-" version ".tar.bz2")) (sha256 - (base32 "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w")))) + (base32 "0ymrmgllyjk9wp1f1ayw51xc3myar8ld9a5531wdbrym0xzy4l64")))) (build-system gnu-build-system) (native-inputs `(("intltool" ,intltool) @@ -669,6 +669,7 @@ hours.") `(("cairo" ,cairo) ("curl" ,curl) ("gtk+" ,gtk+) + ("gtkdatabox" ,gtkdatabox) ("pango" ,pango))) (home-page "https://klavaro.sourceforge.io/en/index.html") (synopsis "Touch typing tutor") |