summaryrefslogtreecommitdiff
path: root/gnu/packages/education.scm
Commit message (Collapse)AuthorAge
* gnu: qttools: Rename to qttools-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated with: git grep -l qttools | xargs sed 's/\bqttools\b/\0-5/g' -i git checkout NEWS
* gnu: qtwebengine: Rename to qtwebengine-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated with: git grep -l qtwebengine | xargs sed 's/\bqtwebengine\b/\0-5/g' -i git checkout NEWS
* gnu: qtwebchannel: Rename to qtwebchannel-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated via: git grep -l qtwebchannel | xargs sed 's/\bqtwebchannel\b/\0-5/g' -i git checkout NEWS
* gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated via: git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' -i git checkout NEWS
* gnu: qtquickcontrols: Rename to qtquickcontrols-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated via: git grep -l qtquickcontrols | xargs sed 's/\bqtquickcontrols\b/\0-5/g' -i git checkout NEWS
* gnu: qtdeclarative: Rename to qtdeclarative-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated via the following commands: git grep -l '\bqtdeclarative\b' | xargs sed -E 's/qtdeclarative/\0-5/g' -i git checkout NEWS
* gnu: qtmultimedia: Rename to qtmultimedia-5.Maxim Cournoyer2022-07-31
| | | | | | | Automated via: git grep -l qtmultimedia | xargs sed 's/qtmultimedia/qtmultimedia-5/g' -i git checkout NEWS
* gnu: qtsvg: Rename variable to qtsvg-5.Maxim Cournoyer2022-07-31
| | | | | | | | This is in preparation of the qtsvg update to version 6. This change was automated via the following command: git grep -l '\bqtsvg\b' | xargs sed 's/qtsvg/qtsvg-5/g' -i
* gnu: fet: Update to 6.5.3.base-for-series-12808base-for-series-12806base-for-series-12805base-for-series-12804base-for-series-12803base-for-series-12801Nicolas Goaziou2022-06-21
| | | | * gnu/packages/education.scm (fet): Update to 6.5.3.
* gnu: Remove childsplay.Maxim Cournoyer2022-05-31
| | | | * gnu/packages/education.scm (childsplay): Delete variable.
* gnu: Remove omnitux.Maxim Cournoyer2022-05-31
| | | | * gnu/packages/education.scm (omnitux): Delete variable.
* gnu: gcompris-qt: Use kde download mirror url.Efraim Flashner2022-03-24
| | | | | * gnu/packages/education.scm (gcompris-qt)[source]: Use kde mirror url scheme.
* gnu: Add openboard.Nicolas Goaziou2022-03-22
| | | | | | | * gnu/packages/education.scm (openboard): New variable. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
* gnu: gcompris-qt: Update to 2.3.base-for-series-11626base-for-series-11624base-for-series-11623base-for-series-11622Efraim Flashner2022-03-14
| | | | * gnu/packages/education.scm (gcompris-qt): Update to 2.3.
* gnu: anki: Remove a transitive dependency on QtWebKit.Leo Famulari2022-01-28
| | | | | | | See <https://issues.guix.gnu.org/53289> for more information about this change. * gnu/packages/education.scm (anki)[inputs]: Replace python-pyqt with python-pyqt-without-qtwebkit.
* gnu: gcompris-qt: Update to 2.1.Efraim Flashner2022-01-24
| | | | | * gnu/packages/education.scm (gcompris-qt): Update to 2.1. [source]: Download from new upstream location.
* gnu: snap: Remove inputs labels.Nicolas Goaziou2022-01-18
| | | | * gnu/packages/education.scm (snap)[inputs]: Remove labels.
* gnu: snap: Update to 7.0.5.Nicolas Goaziou2022-01-18
| | | | * gnu/packages/education.scm (snap): Update to 7.0.5.
* gnu: toutenclic: Remove trailing #T from phases.Nicolas Goaziou2022-01-14
| | | | | * gnu/packages/education.scm (toutenclic)[arguments]<#:phases>: Remove trailing #T.
* gnu: toutenclic: Use archived source.Nicolas Goaziou2022-01-14
| | | | * gnu/packages/education.scm (toutenclic)[source]: Use archive.org mirror.
* gnu: snap: Update to 7.0.3.Nicolas Goaziou2022-01-04
| | | | * gnu/packages/education.scm (snap): Update to 7.0.3.
* gnu: gcompris: Fix build with GCC 10.Felix Gruber2022-01-02
| | | | | | * gnu/packages/education.scm (gcompris)[arguments]: Add -fcommon to CFLAGS. Signed-off-by: Leo Famulari <leo@famulari.name>
* gnu: gcompris-qt: Update to 2.0.Nicolas Goaziou2021-12-18
| | | | | | | * gnu/packages/education.scm (gcompris-qt): Update to 2.0. [arguments]: Remove trailing #T. [native-inputs, inputs]: Remove labels. [license]: Change license from gpl3+ to agpl3+.
* gnu: Further simplify package inputs.Ludovic Courtès2021-12-13
| | | | | | | | | This is the result of running: ./pre-inst-env guix style --input-simplification=safe and manually undoing changes on a dozen of packages to reduce rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
* gnu: Simplify package inputs.Ludovic Courtès2021-12-13
| | | | | | | | This commit was obtained by running: ./pre-inst-env guix style without any additional argument.
* Merge branch 'master' into core-updates-frozenLudovic Courtès2021-11-23
|\
| * gnu: fet: Update to 6.2.2.Nicolas Goaziou2021-11-17
| | | | | | | | * gnu/packages/education.scm (fet): Update to 6.2.2.
* | gnu: Use 'search-input-file' some more.Ludovic Courtès2021-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces occurrences of: (string-append (assoc-ref %build-inputs "…") "/…") by: (search-input-file %build-inputs "/…") * doc/guix.texi (Miscellaneous Services): Use 'search-input-file' in R Shiny example. * gnu/packages/admin.scm (screenfetch): Use 'search-input-file'. (ufetch): Likewise. (hosts): Likewise. * gnu/packages/backup.scm (dirvish): Likewise. * gnu/packages/code.scm (colormake): Likewise. * gnu/packages/compression.scm (makeself-safeextract): Likewise. * gnu/packages/debug.scm (scanmem): Likewise. * gnu/packages/education.scm (snap): Likewise. (omnitux): Likewise. * gnu/packages/emacs-xyz.scm (epipe): Likewise. * gnu/packages/games.scm (openttd-opensfx): Likewise. (openttd-openmsx): Likewise. (openrct2-title-sequences): Likewise. (openrct2-objects): Likewise. (mrrescue): Likewise. (0ad-data): Likewise. (xonotic-data): Likewise. (drascula): Likewise. (make-lure-package): Likewise. (make-queen-package): Likewise. (sky): Likewise. * gnu/packages/gnome.scm (network-manager): Likewise. * gnu/packages/gnuzilla.scm (icedove): Likewise. * gnu/packages/guile-xyz.scm (guile-shapefile): Likewise. * gnu/packages/hurd.scm (netdde): Likewise. * gnu/packages/javascript.scm (js-context-menu): Likewise. (js-commander): Likewise. (js-xmldom-sre): Likewise. * gnu/packages/kde-frameworks.scm (krunner): Likewise. * gnu/packages/kodi.scm (kodi-cli): Likewise. * gnu/packages/libreoffice.scm (hunspell-dict-pl): Likewise. * gnu/packages/linux.scm (e2fsck/static): Likewise. * gnu/packages/markup.scm (markdown): Likewise. * gnu/packages/maths.scm (hdf-java): Likewise. * gnu/packages/multiprecision.scm (libtomcrypt): Likewise. * gnu/packages/networking.scm (batctl): Likewise. * gnu/packages/python-xyz.scm (python-pymediainfo): Likewise. * gnu/packages/shells.scm (fish-foreign-env): Likewise. * gnu/packages/tex.scm (texlive-fonts-iwona): Likewise. * gnu/packages/upnp.scm (miniupnpc): Likewise. * gnu/packages/version-control.scm (git-annex-remote-rclone): Likewise. * gnu/packages/virtualization.scm (qemu): Likewise. * gnu/packages/web.scm (icedtea-web): Likewise. * gnu/packages/wm.scm (stumpish): Likewise.
* | Merge remote-tracking branch 'origin/master' into core-updates-frozen.Mathieu Othacehe2021-10-12
|\|
| * gnu: fet: Add alternative URL for older source tarballs.Ludovic Courtès2021-10-07
| | | | | | | | * gnu/packages/education.scm (fet)[source]: Add "old/" URL.
| * gnu: fet: Update to 6.1.8.Nicolas Goaziou2021-10-07
| | | | | | | | * gnu/packages/education.scm (fet): Update to 6.1.8.
* | gnu: tuxmath: Fix building with newer gcc.Efraim Flashner2021-10-08
| | | | | | | | | | * gnu/packages/education.scm (tuxmath)[source]: Adjust snippet to remove duplicate code definition.
* | gnu: t4k-common: Fix building with newer gcc.Efraim Flashner2021-10-08
| | | | | | | | | | * gnu/packages/education.scm (t4l-common)[source]: Add snippet to update code for stricter checks with newer gcc versions.
* | Merge branch 'master' into core-updates-frozenMarius Bakke2021-09-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnu/packages/bioinformatics.scm gnu/packages/chez.scm gnu/packages/docbook.scm gnu/packages/ebook.scm gnu/packages/gnome.scm gnu/packages/linux.scm gnu/packages/networking.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/tex.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/dune.scm guix/build-system/go.scm guix/build-system/linux-module.scm guix/packages.scm
| * gnu: Add qolibri.nixo2021-09-13
| | | | | | | | | | | | * gnu/packages/education.scm (qolibri): New variable. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
| * gnu: Add libeb.nixo2021-09-13
| | | | | | | | | | | | * gnu/packages/education.scm (libeb): New variable. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
* | Merge branch 'master' into core-updates-frozenMarius Bakke2021-08-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnu/packages/algebra.scm gnu/packages/games.scm gnu/packages/golang.scm gnu/packages/kerberos.scm gnu/packages/mail.scm gnu/packages/python.scm gnu/packages/ruby.scm gnu/packages/scheme.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm
| * gnu: gcompris-qt: Switch to qt-build-system.Efraim Flashner2021-08-10
| | | | | | | | | | | | * gnu/packages/education.scm (gcompris-qt)[build-system]: Switch from cmake-build-system to qt-build-system. [arguments]: Remove custom 'wrap-executable phase.
| * gnu: gcompris-qt: Update to 1.1.Efraim Flashner2021-08-10
| | | | | | | | * gnu/packages/education.scm (gcompris-qt): Update to 1.1.
* | Merge branch 'master' into core-updates-frozenMarius Bakke2021-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnu/packages/bioinformatics.scm gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/emacs-xyz.scm gnu/packages/gpodder.scm gnu/packages/music.scm gnu/packages/patches/glibc-bootstrap-system.patch gnu/packages/python-xyz.scm gnu/packages/shells.scm gnu/packages/statistics.scm
| * gnu: snap: Update to 6.9.0.Nicolas Goaziou2021-07-29
| | | | | | | | * gnu/packages/education.scm (snap): Update to 6.9.0.
* | gnu: Use 'search-input-directory' and 'search-input-file' where appropriate.Ludovic Courtès2021-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes some of the remaining uses of this idiom: (string-append (assoc-ref inputs "LABEL") "FILE") to one of: (search-input-file inputs "FILE") (search-input-directory inputs "FILE") * gnu/packages/axoloti.scm (axoloti-patcher): Use 'search-input-directory'. (axoloti-patcher-next): Likewise. * gnu/packages/bioinformatics.scm (java-picard): Likewise. * gnu/packages/bootloaders.scm (grub-hybrid): Likewise. (u-boot-puma-rk3399): Likewise. (u-boot-rock64-rk3328): Likewise. (u-boot-firefly-rk3399): Likewise. (u-boot-rockpro64-rk3399): Likewise. (u-boot-pinebook-pro-rk3399): Likewise. * gnu/packages/cran.scm (r-shiny): Likewise. (r-shinytree): Likewise. * gnu/packages/education.scm (anki): Likewise. * gnu/packages/emacs-xyz.scm (emacs-flycheck-grammalecte): Likewise. (emacs-rime): Likewise. * gnu/packages/emulators.scm (dolphin-emu): Likewise. * gnu/packages/games.scm (bsd-games): Likewise. (seahorse-adventures): Likewise. (einstein): Likewise. * gnu/packages/gimp.scm (gimp-fourier): Likewise. * gnu/packages/gnome.scm (gspell): Likewise. * gnu/packages/guile-xyz.scm (guile-libyaml): Likewise. * gnu/packages/java.scm (icedtea-7): Likewise. * gnu/packages/language.scm (nimf): Likewise. * gnu/packages/lxde.scm (spacefm): Likewise. * gnu/packages/mail.scm (claws-mail): Likewise. * gnu/packages/netpbm.scm (netpbm): Likewise. * gnu/packages/networking.scm (blueman): Likewise. * gnu/packages/scheme.scm (scm): Likewise. * gnu/packages/security-token.scm (python-fido2): Likewise. * gnu/packages/syndication.scm (rtv): Likewise. * gnu/packages/tls.scm (acme-client): Likewise. * gnu/packages/web.scm (netsurf): Likewise. * gnu/packages/wine.scm (wine-staging): Likewise. * gnu/packages/wxwidgets.scm (wxwidgets): Likewise.
* | gnu: Use 'search-input-file' when looking for executables.Ludovic Courtès2021-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/admin.scm (isc-dhcp): Use 'search-input-file' when looking for executables. * gnu/packages/audio.scm (ableton-link): Likewise. * gnu/packages/benchmark.scm (fio): Likewise. * gnu/packages/bioinformatics.scm (roary): Likewise. (ngless): Likewise. * gnu/packages/boost.scm (boost-for-irods): Likewise. * gnu/packages/bootloaders.scm (grub): Likewise. (grub-efi): Likewise. * gnu/packages/chemistry.scm (inchi): Likewise. * gnu/packages/dictionaries.scm (ding): Likewise. * gnu/packages/dlang.scm (ldc): Likewise. * gnu/packages/education.scm (childsplay): Likewise. * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Likewise. (emacs-haskell-mode): Likewise. (emacs-auctex): Likewise. (emacs-ggtags): Likewise. (emacs-graphviz-dot-mode): Likewise. (emacs-flycheck-grammalecte): Likewise. (emacs-counsel-notmuch): Likewise. (emacspeak): Likewise. (emacs-exwm): Likewise. (emacs-exwm-x): Likewise. (emacs-treemacs): Likewise. (emacs-telega): Likewise. (emacs-exiftool): Likewise. * gnu/packages/emulators.scm (higan): Likewise. * gnu/packages/engineering.scm (freehdl): Likewise. (librepcb): Likewise. * gnu/packages/entr.scm (entr): Likewise. * gnu/packages/file-systems.scm (libeatmydata): Likewise. (xfstests): Likewise. (mergerfs): Likewise. (mergerfs-tools): Likewise. * gnu/packages/finance.scm (monero-gui): Likewise. * gnu/packages/flashing-tools.scm (flashrom): Likewise. * gnu/packages/fontutils.scm (fontforge): Likewise. * gnu/packages/game-development.scm (python2-renpy): Likewise. * gnu/packages/games.scm (opensurge): Likewise. (xboard): Likewise. (hyperrogue): Likewise. (flare-game): Likewise. (chessx): Likewise. * gnu/packages/geo.scm (grass): Likewise. * gnu/packages/glib.scm (glib): Likewise. * gnu/packages/gnome.scm (mm-common): Likewise. (network-manager-openvpn): Likewise. (network-manager-vpnc): Likewise. (network-manager-openconnect): Likewise. (apostrophe): Likewise. * gnu/packages/gnupg.scm (pius): Likewise. (jetring): Likewise. * gnu/packages/gnuzilla.scm (icedove): Likewise. * gnu/packages/golang.scm (go-1.4): Likewise. * gnu/packages/graphviz.scm (xdot): Likewise. * gnu/packages/guile-xyz.scm (jupyter-guile-kernel): Likewise. * gnu/packages/haskell-xyz.scm (ghc-hindent): Likewise. * gnu/packages/ibus.scm (ibus): Likewise. * gnu/packages/image.scm (phockup): Likewise. * gnu/packages/irc.scm (quassel): Likewise. * gnu/packages/java.scm (drip): Likewise. (ant-bootstrap): Likewise. (tla2tools): Likewise. * gnu/packages/julia.scm (julia): Likewise. * gnu/packages/less.scm (lesspipe): Likewise. * gnu/packages/libreoffice.scm (libreoffice): Likewise. * gnu/packages/linux.scm (fuse): Likewise. (lm-sensors): Likewise. (bluez): Likewise. (fakeroot): Likewise. (inputattach): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-cl-diskspace): Likewise. * gnu/packages/lisp.scm (lisp-repl-core-dumper): Likewise. * gnu/packages/lua.scm (fennel): Likewise. * gnu/packages/lxde.scm (spacefm): Likewise. * gnu/packages/mail.scm (public-inbox): Likewise. * gnu/packages/maths.scm (hdf-java): Likewise. (maxima): Likewise. (frama-c): Likewise. * gnu/packages/messaging.scm (libgadu): Likewise. * gnu/packages/music.scm (denemo): Likewise. (curseradio): Likewise. * gnu/packages/netpbm.scm (netpbm): Likewise. * gnu/packages/networking.scm (blueman): Likewise. (squid): Likewise. (aircrack-ng): Likewise. * gnu/packages/node.scm (node): Likewise. (node-llparse-frontend-bootstrap): Likewise. (node-llparse-bootstrap): Likewise. (llhttp-bootstrap): Likewise. (node-lts): Likewise. * gnu/packages/ocaml.scm (ocaml-4.11): Likewise. (opam): Likewise. (ocaml-graph): Likewise. * gnu/packages/orpheus.scm (orpheus): Likewise. * gnu/packages/password-utils.scm (password-store): Likewise. * gnu/packages/python.scm (pypy3): Likewise. * gnu/packages/qt.scm (qt5ct): Likewise. * gnu/packages/radio.scm (libosmo-dsp): Likewise. * gnu/packages/ruby.scm (ruby-pandoc-ruby): Likewise. * gnu/packages/rust.scm (rust-1.30): Likewise. * gnu/packages/screen.scm (byobu): Likewise. * gnu/packages/statistics.scm (r-with-tests): Likewise. * gnu/packages/suckless.scm (surf): Likewise. * gnu/packages/syndication.scm (gfeeds): Likewise. * gnu/packages/telephony.scm (mumble): Likewise. * gnu/packages/terminals.scm (alacritty): Likewise. * gnu/packages/tex.scm (texlive-bin): Likewise. * gnu/packages/uml.scm (plantuml): Likewise. * gnu/packages/version-control.scm (python-git-multimail): Likewise. (gitolite): Likewise. (hg-commitsigs): Likewise. (git-when-merged): Likewise. (git-imerge): Likewise. (gita): Likewise. * gnu/packages/video.scm (you-get): Likewise. * gnu/packages/vim.scm (eovim): Likewise. * gnu/packages/virtualization.scm (qemu): Likewise. (virt-manager): Likewise. (criu): Likewise. * gnu/packages/vpn.scm (strongswan): Likewise. (xl2tpd): Likewise. * gnu/packages/wm.scm (i3lock-fancy): Likewise. * gnu/packages/wxwidgets.scm (python-wxpython): Likewise. (python2-wxpython): Likewise. * gnu/packages/xdisorg.scm (autorandr): Likewise. * gnu/packages/xorg.scm (hackneyed-x11-cursors): Likewise. (v86d): Likewise. (mkfontdir): Likewise. (xpra): Likewise.
* | gnu: Use 'search-input-directory' for the SDL header directory.Ludovic Courtès2021-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/education.scm (gcompris)[arguments]: Use 'search-input-directory' when searching for SDL headers. * gnu/packages/education.scm (t4k-common): Likewise. (tuxmath): Likewise. * gnu/packages/game-development.scm (tesseract-engine): Likewise. * gnu/packages/games.scm (foobillard++): Likewise. (ltris): Likewise. (prboom-plus): Likewise. (abbaye): Likewise. (red-eclipse): Likewise. (kiki): Likewise. (tome4): Likewise. (btanks): Likewise. (4dtris): Likewise. (edgar): Likewise. * gnu/packages/python-xyz.scm (python-kivy): Likewise.
* | gnu: Simplify "Xvbf" invocation in pre-check phases.Ludovic Courtès2021-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/geo.scm (qgis)[arguments]: Simplify invocation of 'Xvfb' in 'check' phase, assuming 'Xvfb' is in $PATH. * gnu/packages/graphics.scm (opensubdiv)[arguments]: Likewise. * gnu/packages/java-graphics.scm (java-piccolo2d-extras)[arguments]: Likewise. * gnu/packages/kde-frameworks.scm (kcontacts)[arguments]: Likewise. (kdeclarative)[arguments]: Likewise. * gnu/packages/kde-multimedia.scm (elisa)[arguments]: Likewise. * gnu/packages/kde-plasma.scm (kscreenlocker)[arguments]: Likewise. * gnu/packages/radio.scm (gnuradio)[arguments]: Likewise. * gnu/packages/education.scm (gcompris-qt)[arguments]: Likewise. * gnu/packages/freedesktop.scm (weston)[arguments]: Likewise.
* | Merge branch 'master' into core-updatesLudovic Courtès2021-07-18
|\|
| * gnu: fet: Update to 6.0.4.Nicolas Goaziou2021-07-04
| | | | | | | | | | * gnu/packages/education.scm (fet): Update to 6.0.4. [inputs]: Use Qt 6.
| * gnu: Add gotypist.Tobias Geerinckx-Rice2021-07-03
| | | | | | | | * gnu/packages/education.scm (gotypist): New public variable.
* | Merge branch 'master' into core-updatesMarius Bakke2021-06-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this merge actually changes the 'curl' and 'python-attrs' derivations, as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and 12964df69a99de6190422c752fef65ef813f3b6b respectively. 4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it cannot currently be tested. Conflicts: gnu/local.mk gnu/packages/aidc.scm gnu/packages/boost.scm gnu/packages/curl.scm gnu/packages/nettle.scm gnu/packages/networking.scm gnu/packages/python-xyz.scm gnu/packages/tls.scm
| * gnu: Rename qtbase to qtbase-5.Maxim Cournoyer2021-06-14
| | | | | | | | | | | | | | | | | | | | | | | | This change was automated via the following command: $ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g' $ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g' $ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g' $ git checkout etc # to clear some spurious changes This is done so the qtbase package can be upgraded to version 6 in the following commit.