diff options
author | Christopher Baines <mail@cbaines.net> | 2020-11-29 14:19:55 +0000 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2020-11-29 17:34:18 +0000 |
commit | ff01206345e2306cc633db48e0b29eab9077091a (patch) | |
tree | 25c7ee17005dadc9bf4fae3f0873e03a4704f782 /gnu/packages/education.scm | |
parent | ed2545f0fa0e2ad99d5a0c45f532c539b299b9fb (diff) | |
parent | 7c2e67400ffaef8eb6f30ef7126c976ee3d7e36c (diff) | |
download | guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar guix-patches-ff01206345e2306cc633db48e0b29eab9077091a.tar.gz |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/education.scm')
-rw-r--r-- | gnu/packages/education.scm | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index d91c086581..953b99778e 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -140,7 +140,7 @@ of categories with some of the activities available in that category. (define-public gcompris-qt (package (name "gcompris-qt") - (version "0.98") + (version "1.0") (source (origin (method url-fetch) @@ -148,22 +148,19 @@ of categories with some of the activities available in that category. "https://gcompris.net/download/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 - (base32 "1jmjykn0lpk0v6hs2flmch8v4da5bgxl891nav7szxw9l7aqnf4y")))) + (base32 "08dw1q0h4qz2q0ksa5pbmb9v60hr1zv9skx6z8dlq9b1i7harnds")))) (build-system cmake-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - (substitute* "tests/core/CMakeLists.txt" - (("DownloadManagerTest\\.cpp") "#")) - #t)) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. (system (string-append (assoc-ref inputs "xorg-server") "/bin/Xvfb :1 &")) (setenv "DISPLAY" ":1") + ;; The test suite wants to write to /homeless-shelter + (setenv "HOME" (getcwd)) #t)) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) @@ -192,7 +189,7 @@ of categories with some of the activities available in that category. ("xorg-server" ,xorg-server-for-tests))) (inputs `(("openssl" ,openssl) - ("python-2" ,python-2) + ("python" ,python-wrapper) ("qtbase" ,qtbase) ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) @@ -217,7 +214,8 @@ Currently available boards include: @item reading practice @item small games (memory games, jigsaw puzzles, ...) @end enumerate\n") - (license license:gpl3+))) + (license (list license:silofl1.1 ; bundled fonts + license:gpl3+)))) (define-public tipp10 (package @@ -275,7 +273,7 @@ easy.") (define-public snap (package (name "snap") - (version "6.2.1") + (version "6.3.3") (source (origin (method git-fetch) @@ -284,7 +282,7 @@ easy.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "163pskgrssw0l6c73lrdx613fridnv0162lscl4xqx9sgg7hfaxh")))) + (base32 "0zlyk241s6sh5zaqrvfpg4lx7jdifajsdf6c9qhh77vxxh5gwzrc")))) (build-system trivial-build-system) (arguments `(#:modules ((guix build utils)) @@ -613,14 +611,14 @@ Portuguese, Spanish and Italian.") (define-public fet (package (name "fet") - (version "5.47.0") + (version "5.48.0") (source (origin (method url-fetch) (uri (string-append "https://www.lalescu.ro/liviu/fet/download/" "fet-" version ".tar.bz2")) (sha256 - (base32 "1a4mzzd6qy7hpb3yvmf922dbrqrzacz60ld8dsds78m018jf9gaj")))) + (base32 "12bd53r841r8zsn3v1kzws2qar908p6g6mlnm50kmjkxramr63ga")))) (build-system gnu-build-system) (arguments `(#:phases @@ -956,7 +954,7 @@ floating through space.") (define-public mdk (package (name "mdk") - (version "1.2.11") + (version "1.3.0") (source (origin (method url-fetch) @@ -964,7 +962,7 @@ floating through space.") version ".tar.gz")) (sha256 (base32 - "0rrac91ynya4jrhv14j9vvn21c5z80hi1zmmdxjb0d9zz6i7kjgb")))) + "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-gui=yes" "-with-readline=yes"))) @@ -979,7 +977,7 @@ floating through space.") ("ncurses" ,ncurses) ("pango" ,pango) ("readline" ,readline))) - (home-page "https://www.gnu.org/software/mdk/") + (home-page "https://www.gnu.org/software/mdk/manual/") (synopsis "Virtual development environment for Knuth's MIX") (description "GNU MDK is the Mix Development Kit, an emulation of the pedagogical |