summaryrefslogtreecommitdiff
path: root/gnu/packages/engineering.scm
AgeCommit message (Collapse)Author
2021-12-13gnu: Simplify package inputs.Ludovic Courtès
This commit was obtained by running: ./pre-inst-env guix style without any additional argument.
2021-12-10Merge remote-tracking branch 'signed/master' into core-updatesMathieu Othacehe
2021-12-09gnu: valeronoi: Update to 0.1.6.Petr Hodina
* gnu/packages/engineering.scm (valeronoi): Update to 0.1.6. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
2021-12-06gnu: poke: Remove generated files.Efraim Flashner
* gnu/packages/engineering.scm (poke)[source]: Add snippet to remove generated files.
2021-12-06gnu: poke: Update to 1.4.Efraim Flashner
* gnu/packages/engineering.scm (poke): Update to 1.4. [native-inputs]: Remove clisp, perl, python-2, and python-3.
2021-12-06gnu: poke: Update metadata.Efraim Flashner
* gnu/packages/engineering.scm (poke)[home-page]: Use GNU home-page. [synopsis]: Use upstream synopsis. [description]: Reflow.
2021-12-05Merge remote-tracking branch 'origin/master' into core-updates-frozenRicardo Wurmus
2021-12-03gnu: Add valeronoi.phodina
* gnu/packages/engineering.scm (valeronoi): New variable. Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
2021-11-30gnu: freecad: Fix build.Mathieu Othacehe
* gnu/packages/patches/freecad-boost-serialization.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/engineering.scm (freecad) [source]: Use it. [arguments]{#:configure-flags}: Turn it into a GEXP and adapt it.
2021-11-30gnu: freecad: Switch to vtk-9.Mathieu Othacehe
Switch to vtk-9 with the relevant patch to be able to get rid of vtk-8. * gnu/packages/patches/freecad-vtk9.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/engineering.scm (freecad)[source]: Use it.
2021-11-22gnu: linsmith: Pass -fcommon to compiler.Ricardo Wurmus
* gnu/packages/engineering.scm (linsmith)[arguments]: Add -fcommon to CFLAGS.
2021-11-22gnu: freecad: Use GUIX_PYTHONPATH.Ricardo Wurmus
* gnu/packages/engineering.scm (freecad)[arguments]: Use GUIX_PYTHONPATH.
2021-11-17Merge branch 'master' into core-updates-frozenLudovic Courtès
2021-11-08gnu: packages: Remove last year's deprecations.Tobias Geerinckx-Rice
* gnu/packages/admin.scm (guile3.0-shepherd): Remove variable. * gnu/packages/benchmark.scm (imb-openmpi): Likewise. * gnu/packages/boost.scm (boost-with-python3): Likewise. * gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly. * gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise. * gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly. * gnu/packages/cups.scm (escpr): Likewise. * gnu/packages/django.scm (python-django-jsonfield): Likewise. * gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme) (emacs-modus-vivendi-theme): Likewise. * gnu/packages/engineering.scm (kicad-i18l): Likewise. * gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise. * gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u): Likewise. * gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic): Likewise. * gnu/packages/game-development.scm (guile3.0-chickadee) (python-sge-pygame): Likewise. * gnu/packages/games.scm (retux)[inputs]: Adjust accordingly. * gnu/packages/gnome-xyz.scm (numix-theme): Likewise. * gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise. * gnu/packages/gstreamer.scm (gst-transcoder): Likewise. * gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg): Likewise. * gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark) (guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi) (guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics) (guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren) (guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted) (guile3.0-pfds, guile3.0-picture-language, guile3.0-semver) (guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight) (guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise. * gnu/packages/guile.scm (define-deprecated-guile3.0-package) (guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3) (guile3.0-bytestructures, guile3.0-git): Likewise. * gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise. * gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise. * gnu/packages/mail.scm (guile3.0-mailutils): Likewise. * gnu/packages/monitoring.scm (python2-graphite-web): Likewise. * gnu/packages/package-management.scm (guile3.0-guix): Likewise. * gnu/packages/package-management.scm (python-conda): Likewise. * gnu/packages/phabricator.scm (libphutil): Likewise. * gnu/packages/plotutils.scm (guile3.0-charting): Likewise. * gnu/packages/python-xyz.scm (python2-smmap2, python-glances) (python-smmap2): Likewise. * gnu/packages/shells.scm (oil-shell): Likewise. * gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise. * gnu/packages/ssh.scm (guile3.0-ssh): Likewise. * gnu/packages/terminals.scm (et): Likewise. * gnu/packages/tls.scm (guile3.0-gnutls): Likewise. * gnu/packages/vlang.scm (v): Likewise. * gnu/packages/vpn.scm (wireguard): Likewise. * gnu/packages/web-browsers.scm (next, sbcl-next): Likewise. * gnu/packages/xorg.scm (transset-df): Likewise.
2021-10-31Merge remote-tracking branch 'origin/master' into core-updates-frozenEfraim Flashner
2021-10-27gnu: kicad: Update home page.Julien Lepiller
* gnu/packages/engineering.scm (kicad)[home-page]: Update.
2021-10-21gnu: lepton-eda: Pass -fcommon.Ricardo Wurmus
* gnu/packages/engineering.scm (lepton-eda)[arguments]: Add -fcommon to CFLAGS.
2021-10-21gnu: geda-gaf: Update to 1.10.2.Ricardo Wurmus
* gnu/packages/engineering.scm (geda-gaf): Update to 1.10.2. [native-inputs]: Add groff.
2021-10-21gnu: gerbv: Fix linker error by adding -fcommon to CFLAGS.Ricardo Wurmus
* gnu/packages/engineering.scm (gerbv)[arguments]: Set -fcommon option.
2021-10-12Merge remote-tracking branch 'origin/master' into core-updates-frozen.Mathieu Othacehe
2021-10-06gnu: librepcb: Update to 0.1.5.Tobias Geerinckx-Rice
* gnu/packages/engineering.scm (librepcb): Update to 0.1.5.
2021-10-04gnu: kicad: Update to 5.1.10.Peter Polidoro
* gnu/packages/engineering.scm (kicad, kicad-i18n, kicad-doc, kicad-symbols) (kicad-footprints, kicad-packages3d, kicad-templates): Update to 5.1.10. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-10-04gnu: librecad: Build with qt-build-system.Efraim Flashner
* gnu/packages/engineering.scm (librecad)[build-system]: Switch to qt-build-system. [arguments]: Add test-target. Remove custom 'wrap-executable phase.
2021-10-04gnu: librecad: Don't use autogenerated tarball.Efraim Flashner
* gnu/packages/engineering.scm (librecad)[source]: Download using git-fetch.
2021-09-21gnu: libngspice: Update to 35.Vinicius Monego
* gnu/packages/engineering.scm (libngspice): Update to 35. [arguments]<#:phases>: Rename 'delete-scripts-and-config to 'delete-scripts and don't try to delete config.h because that file was removed in this version. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-09-21gnu: Add prusa-slicer.Ivan Gankevich
* gnu/packages/engineering.scm (prusa-slicer): New variable. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2021-09-21gnu: Add libigl.Ivan Gankevich
* gnu/packages/engineering.scm (libigl): New variable. Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
2021-09-17Merge branch 'master' into core-updates-frozenMarius Bakke
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
2021-09-12gnu: Remove duplicate libxml++ packages.Tobias Geerinckx-Rice
Reported-by: Guillaume Le Vaillant <glv@posteo.net> * gnu/packages/engineering.scm (freecad)[inputs]: Replace libxmlplusplus-2 with libxml++-2. * gnu/packages/music.scm (tascam-gtk)[inputs]: Replace libxmlplusplus with libxml++. * gnu/packages/xml.scm (libxmlplusplus, libxmlplusplus-2.4): Remove unused variables.
2021-09-11gnu: kicad: Fix build.Guillaume Le Vaillant
* gnu/packages/engineering.scm (kicad)[arguments]: Add 'fix-python-detection' and 'add-missing-include' phases.
2021-09-06gnu: Use the non-deprecated TeX packages.Ludovic Courtès
This commit leaves 'dblatex' and 'texlive-hyperref' as users of deprecated packages, but these have many dependents. * gnu/packages/bioinformatics.scm (discrover)[native-inputs]: Use non-deprecated TeX Live packages. (velvet)[native-inputs]: Likewise. * gnu/packages/chez.scm (chez-scheme)[native-inputs]: Likewise. (chez-web)[native-inputs]: Likewise. * gnu/packages/engineering.scm (fastcap)[native-inputs]: Likewise. * gnu/packages/guile-xyz.scm (emacsy)[native-inputs]: Likewise. * gnu/packages/maths.scm (hypre)[native-inputs]: Likewise. * gnu/packages/music.scm (lilypond)[native-inputs]: Likewise. * gnu/packages/ocaml.scm (ocaml-bibtex2html)[native-inputs]: Likewise. * gnu/packages/plotutils.scm (asymptote)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-numpy-documentation)[native-inputs]: Likewise. (python-matplotlib-documentation)[native-inputs]: Likewise. (python-ipython-documentation)[native-inputs]: Likewise. (python-nbconvert)[native-inputs]: Likewise. (python-pypandoc)[native-inputs]: Likewise. * gnu/packages/statistics.scm (r-with-tests)[native-inputs]: Likewise. * gnu/packages/tex.scm (texlive-pstool)[propagated-inputs]: Likewise. (teximpatient)[native-inputs]: Likewise. (texlive-latex-pgf)[propagated-inputs]: Likewise. (texlive-beamer)[propagated-inputs]: Likewise.
2021-08-12Merge branch 'master' into core-updates-frozenMarius Bakke
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
2021-08-04gnu: Fix broken links to Arch Linux git repositoriesMilkey Mouse
* gnu/packages/crypto.scm (libsecp256k1): Update comment patch link. * gnu/packages/engineering.scm (freehdl): Update patch link. * gnu/packages/tex.scm (texlive-bin): Update arch-patch base URL. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-07-24gnu: Use 'search-input-file' when looking for executables.Ludovic Courtès
* 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.
2021-07-24gnu: Use 'search-input-file' when looking for *.so and *.a.Ludovic Courtès
* gnu/packages/bioinformatics.scm (sailfish)[arguments]: Use 'search-input-file' when looking for *.a and *.so. * gnu/packages/emulators.scm (dolphin-emu): Likewise. * gnu/packages/engineering.scm (lepton-eda): Likewise. (pcb): Likewise. * gnu/packages/golang.scm (go-1.4): Likewise. (go-1.14): Likewise. * gnu/packages/haskell.scm (ghc-7): Likewise. * gnu/packages/irods.scm (irods): Likewise. * gnu/packages/language.scm (python2-tegaki-pygtk): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-lzlib): Likewise. (sbcl-cl-gobject-introspection): Likewise. (sbcl-cl-ana): Likewise. (sbcl-cl-libuv): Likewise. (sbcl-cl-async): Likewise. (sbcl-mcclim): Likewise. (sbcl-zstd): Likewise. (sbcl-cl-opengl): Likewise. (sbcl-lev): Likewise. (sbcl-cl-glfw3): Likewise. * gnu/packages/machine-learning.scm (tensorflow): Likewise. * gnu/packages/messaging.scm (utox): Likewise. * gnu/packages/mpi.scm (java-openmpi): Likewise. * gnu/packages/music.scm (jack-select): Likewise. * gnu/packages/pascal.scm (fpc): Likewise. * gnu/packages/python-crypto.scm (python-libnacl): Likewise. * gnu/packages/python-xyz.scm (python-cairocffi): Likewise. (python-pyev): Likewise. (python-pytidylib): Likewise. * gnu/packages/radio.scm (unixcw): Likewise. * gnu/packages/rust.scm (rust-1.32): Likewise. * gnu/packages/security-token.scm (opensc): Likewise. (python-pyscard): Likewise. * gnu/packages/selinux.scm (python-setools): Likewise. * gnu/packages/spice.scm (libcacard): Likewise. * gnu/packages/telephony.scm (libtgvoip): Likewise.
2021-07-18Merge branch 'master' into core-updatesLudovic Courtès
2021-07-18gnu: Add sterm.phodina
* gnu/packages/engineering.scm (sterm): New variable. Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
2021-07-07gnu: kicad-doc: Remove unnecessary code.Tobias Geerinckx-Rice
* gnu/packages/engineering.scm (arguments): Skip #:tests? instead of deleting the 'check phase. Remove the 'set-perl-env phase.
2021-07-07gnu: kicad-doc: Fix build.Tobias Geerinckx-Rice
Fixes <https://issues.guix.gnu.org/49458>. * gnu/packages/engineering.scm (native-inputs): Add perl-yaml-tiny.
2021-06-25gnu: libredwg: Update to 0.12.4.Tobias Geerinckx-Rice
* gnu/packages/engineering.scm (libredwg): Update to 0.12.4.
2021-06-23Merge branch 'master' into core-updatesTobias Geerinckx-Rice
Conflicts: gnu/packages/cups.scm gnu/packages/python-web.scm gnu/packages/web.scm guix/build/maven/pom.scm
2021-06-22gnu: libngspice: Delete autogenerated config.h.Vinicius Monego
* gnu/packages/engineering.scm (libngspice)[arguments]<#:phases>: Rename phase 'delete-script-files to 'delete-scripts-and-config and delete config.h. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-06-22gnu: libngspice: Fix KiCad compilation.Vinicius Monego
* gnu/packages/engineering.scm (libngspice)[arguments]<#:configure-flags>: Pass "--with-readline=no". [inputs]: Remove readline. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-06-19Merge branch 'master' into core-updatesMarius Bakke
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
2021-06-15gnu: libngspice: Enable ciderlib.Vinicius Monego
* gnu/packages/engineering.scm (libngspice)[source]: Remove snippet that deleted ciderlib. [arguments]: Pass "--enable-ciderlib" to #:configure-flags. [license]: Add license for ciderlib. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-06-15gnu: libngspice: Update to 34.Vinicius Monego
* gnu/packages/engineering.scm (libngspice): Update to 34. [source]: Make some cosmetic changes. [arguments]<#:phases>: Don't return #t. (ngspice)[arguments]<#:phases>: Don't return #t. Remove 'delete-cmpp-dlmain phase because these files are not installed anymore. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-06-14gnu: Rename qtbase to qtbase-5.Maxim Cournoyer
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.
2021-06-06Merge branch 'master' into core-updatesMarius Bakke
Conflicts: gnu/local.mk gnu/packages/algebra.scm gnu/packages/bioinformatics.scm gnu/packages/curl.scm gnu/packages/docbook.scm gnu/packages/emacs-xyz.scm gnu/packages/maths.scm gnu/packages/plotutils.scm gnu/packages/python-web.scm gnu/packages/python-xyz.scm gnu/packages/radio.scm gnu/packages/readline.scm gnu/packages/tls.scm gnu/packages/xml.scm gnu/packages/xorg.scm
2021-06-06gnu: poke: Update to 1.3.Efraim Flashner
* gnu/packages/engineering.scm (poke): Update to 1.3.
2021-05-22Merge branch 'master' into core-updatesMarius Bakke