diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:39:52 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-13 23:45:53 -0500 |
| commit | 01f0707207741ce2a5d7509a175464799b08aea6 (patch) | |
| tree | 08e8f4da56f26363c3b53e0442a21b286b55e0e5 /gnu/packages/education.scm | |
| parent | 734bcf13139119daf8685f93b056c3422dbfa264 (diff) | |
| parent | 6985a1acb3e9cc4cad8b6f63d77154842d25c929 (diff) | |
| download | guix-01f0707207741ce2a5d7509a175464799b08aea6.tar guix-01f0707207741ce2a5d7509a175464799b08aea6.tar.gz | |
Merge branch 'staging' into 'core-updates'.
Conflicts:
gnu/local.mk
gnu/packages/cmake.scm
gnu/packages/curl.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/guile.scm
gnu/packages/node.scm
gnu/packages/openldap.scm
gnu/packages/package-management.scm
gnu/packages/python-xyz.scm
gnu/packages/python.scm
gnu/packages/tls.scm
gnu/packages/vpn.scm
gnu/packages/xorg.scm
Diffstat (limited to 'gnu/packages/education.scm')
| -rw-r--r-- | gnu/packages/education.scm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 953b99778e..07862291a7 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -273,7 +273,7 @@ easy.") (define-public snap (package (name "snap") - (version "6.3.3") + (version "6.5.0") (source (origin (method git-fetch) @@ -282,7 +282,7 @@ easy.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0zlyk241s6sh5zaqrvfpg4lx7jdifajsdf6c9qhh77vxxh5gwzrc")))) + (base32 "0sqd4ddkfc7f7gx02wffvwbqgfbhpkcgyv7v5rh3gx60jca02p4w")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -611,14 +611,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.48.0") + (version "5.48.1") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "12bd53r841r8zsn3v1kzws2qar908p6g6mlnm50kmjkxramr63ga")))) + (base32 "0k728l6zi0lkhzyipsb0f2jw53s4xicm7arp33ikhrvc4jlwcp4v")))) (build-system gnu-build-system) (arguments `(#:phases @@ -677,15 +677,15 @@ language and very flexible regarding to new or unknown keyboard layouts.") (define-public ktouch (package (name "ktouch") - (version "19.08.3") + (version "20.12.0") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/applications/" + (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktouch-" version ".tar.xz")) (sha256 (base32 - "0dqxb3xsjc2rwc9779l5fnr4crhq51bc8ln4azbgnnkzldvq6a4a")))) + "1s8pcwakx94aygfyjmyps5b43j4kv6dmfw7n12japcka2yfp9bi2")))) (build-system qt-build-system) (arguments `(#:phases |