diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
| commit | 533a893cc6b03f100566760d6e0c8e0500ed7082 (patch) | |
| tree | 0ecbf89895a400c43d16bb1f6539f1a88aeaa4cf /gnu/packages/education.scm | |
| parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
| parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
| download | guix-533a893cc6b03f100566760d6e0c8e0500ed7082.tar.gz guix-533a893cc6b03f100566760d6e0c8e0500ed7082.zip | |
Merge branch 'master' into staging
Conflicts:
.guix-authorizations
gnu/ci.scm
gnu/packages/base.scm
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/imagemagick.scm
gnu/packages/password-utils.scm
gnu/packages/python-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 13372489f5..589c32838c 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018, 2019, 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> @@ -276,7 +276,7 @@ easy.") (define-public snap (package (name "snap") - (version "6.5.0") + (version "6.6.0") (source (origin (method git-fetch) @@ -285,7 +285,7 @@ easy.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0sqd4ddkfc7f7gx02wffvwbqgfbhpkcgyv7v5rh3gx60jca02p4w")))) + (base32 "1k0j0sp6zz2hnh7zc7f086zc3sld01h7sk277j6fak914yv6slzy")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -614,14 +614,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.48.1") + (version "5.49.1") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "0k728l6zi0lkhzyipsb0f2jw53s4xicm7arp33ikhrvc4jlwcp4v")))) + (base32 "1aa8xnhwvbhvp7yigcdk7qdwqh59yyfknqbpn3ybgjljc22m8w5n")))) (build-system gnu-build-system) (arguments `(#:phases @@ -689,17 +689,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "10lm2p8w26c9n6lhvw3301myfss0dq7hl7rawzb3hsy1lqvmvdib")))) (build-system qt-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-makefiles - (lambda* (#:key inputs #:allow-other-keys) - (let ((qtdec (assoc-ref inputs "qtdeclarative"))) - (substitute* '("src/CMakeFiles/ktouch_autogen.dir/build.make" - "src/CMakeFiles/ktouch.dir/build.make") - (("/gnu/store/.*qmlcachegen") - (string-append qtdec "/bin/qmlcachegen")))) - #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("kdoctools" ,kdoctools) |