summaryrefslogtreecommitdiff
path: root/gnu/packages/video.scm
Commit message (Collapse)AuthorAge
* 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' when looking for C/C++ library headers.Ludovic Courtès2021-07-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/arcan.scm (arcan)[arguments]: Use 'search-input-directory' for "include/libdrm" and "include/apr-1". * gnu/packages/bioinformatics.scm (sailfish): Likewise for jellyfish. * gnu/packages/boost.scm (boost-for-irods): Likewise for libcxx headers. * gnu/packages/cedille.scm (cedille): Likewise for IAL headers. * gnu/packages/compression.scm (snappy-with-clang6): Likewise for libcxx headers. * gnu/packages/cups.scm (hplip): Likewise for libusb headers. * gnu/packages/emulators.scm (pcsxr): Likewise for libcdio headers. * gnu/packages/game-development.scm (python2-renpy): Likewise for fribidi headers. * gnu/packages/games.scm (pokerth): Likewise for libircclient. * gnu/packages/guile-xyz.scm (guile-persist): Likewise for Guile. * gnu/packages/hurd.scm (hurd): Likewise for libtirpc. * gnu/packages/irods.scm (irods, irods-client-icommands): Likewise for libcxx, catch2, and nlohmann-json-cpp. * gnu/packages/julia.scm (julia): Use 'search-input-file' for libuv's errno.h. * gnu/packages/kde-pim.scm (kdepim-runtime): Use 'search-input-directory' for "include/KF5". (kmessagelib): Likewise. * gnu/packages/kde.scm (kdeconnect): Likewise. * gnu/packages/llvm.scm (clang-runtime-3.5): Likewise for libtirpc. * gnu/packages/mpi.scm (openmpi): Likewise for "include/infiniband". * gnu/packages/pumpio.scm (pumpa): Use 'search-input-file' for "tidy.h" and "aspell.h". * gnu/packages/radio.scm (dream): Use 'search-input-file' and 'search-input-directory' for pulseaudio, sndfile, etc. * gnu/packages/selinux.scm (policycoreutils): Likewise for PAM and libaudit. * gnu/packages/serialization.scm (avro-cpp-1.9-for-irods): Likewise for libcxx. * gnu/packages/sync.scm (nextcloud-client): Likewise for "include/KF5". * gnu/packages/video.scm (mkvtoolnix): Likewise for "include/gtest". (libopenshot): Likewise for "include/UnitTest++". * gnu/packages/virtualization.scm (criu): Likewise for libnl3 and for protobuf file.
* Merge branch 'master' into core-updatesLudovic Courtès2021-07-18
|\
| * gnu: ffmpeg: Enable vaapi.Jack Hill2021-07-15
| | | | | | | | | | | | | | * gnu/packages/video.scm (ffmpeg)[arguments]: Add --enable-vaapi to configure-flags. Signed-off-by: Leo Famulari <leo@famulari.name>
| * gnu: shotcut: Update to 21.06.29.Vinicius Monego2021-07-06
| | | | | | | | | | | | | | | | * gnu/packages/video.scm (shotcut): Update to 21.06.29. [arguments]{#:phases}: Don't return #t. [inputs]: Use MLT 7. Signed-off-by: Leo Famulari <leo@famulari.name>
| * gnu: Add MLT 7.Vinicius Monego2021-07-06
| | | | | | | | | | | | | | * gnu/packages/video.scm (mlt): New variable. (mlt-6): Inherit from above. Signed-off-by: Leo Famulari <leo@famulari.name>
| * gnu: mlt: Rename to mlt-6.Vinicius Monego2021-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/video.scm (mlt): Rename to mlt-6. [build-system]: Use cmake-build-system. [arguments]: Remove #:make-flags. Adjust 'override-LDFLAGS phase. {#:configure-flags}: Remove --enable-gpl3 and --enable-gpl. Set "GTK2_GDKCONFIG_INCLUDE_DIR" and "GTK2_GLIBCONFIG_INCLUDE_DIR". (shotcut): Use mlt-6. * gnu/packages/animation.scm (synfig): Use mlt-6. * gnu/packages/kde.scm (kdenlive): Use mlt-6. This change is to add MLT 7 which will be done in the next commit. Signed-off-by: Leo Famulari <leo@famulari.name>
| * gnu: straw-viewer: Deprecate package.Raghav Gururajan2021-07-04
| | | | | | | | | | | | | | Upstream has replaced straw-viewer with pipe-viewer. Reference https://github.com/trizen/straw-viewer/commit/dc2dfe82 * gnu/packages/video.scm (straw-viewer): Deprecate in favour of pipe-viewer.
| * gnu: Add pipe-viewer.Raghav Gururajan2021-07-04
| | | | | | | | * gnu/packages/video.scm (pipe-viewer): New variable.
| * guix: qt-build-system, qt-utils: Unify wrapping of qt-programs.Hartmut Goebel2021-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify (guix qt-build-system wrap-all-programs) and (guix qt-utils wrap-qt-program), so both behave the same. The functions now reside in qt-utils to make them easily available for packages not using the qt-build-system. * guix/build/qt-build-system.scm (variables-for-wrapping, wrap-all-programs): Move from here ... * guix/build/qt-utils.scm (variables-for-wrapping, wrap-all-qt-programs): ... to here. Base the later on (wrap-qt-program*): New function, carved out from old wrap-all-programs. (wrap-qt-program): Base on wrap-qt-program*, change arguments in an incompatible way. * gnu/packages/bittorrent.scm (qbittorrent)[arguments]<phases>{wrap-qt}: Adjust to new interface of wrap-qt-program. * gnu/packages/finance.scm (electron-cash): Likewise. * gnu/packages/geo.scm (qgis): Likewise. * gnu/packages/password-utils.scm (qtpass): Likewise. * gnu/packages/video.scm (openshot): Likewise. * gnu/packages/web-browsers.scm (kristall): Likewise.
| * gnu: obs: Update to 27.0.1Andrew Tropin2021-07-01
| | | | | | | | | | | | | | | | | | * gnu/packages/video.scm (obs): Update to 27.0.1. [inputs]: Add glib, pipewire, wayland, wayland-protocol. Some plugins now comes as submodules, so recursive? added. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| * gnu: libass: Update to 0.15.1.Tobias Geerinckx-Rice2021-06-29
| | | | | | | | * gnu/packages/video.scm (libass): Update to 0.15.1.
| * gnu: youtube-dl-gui: Update to 4.0.Raghav Gururajan2021-06-26
| | | | | | | | | | | | | | | | This new version requires gettext and twodict. * gnu/packages/video.scm (youtube-dl-gui)[version]: Update to 4.0. [native-inputs]: Add gettext-minimal. [inputs]: Add python2-twodict.
| * gnu: vlc: Update to 3.0.16.Tobias Geerinckx-Rice2021-06-25
| | | | | | | | * gnu/packages/video.scm (vlc): Update to 3.0.16.
* | Merge branch 'master' into core-updatesTobias Geerinckx-Rice2021-06-23
|\| | | | | | | | | | | | | | | Conflicts: gnu/packages/cups.scm gnu/packages/python-web.scm gnu/packages/web.scm guix/build/maven/pom.scm
| * gnu: mlt: Don't hardcode gcc value.Efraim Flashner2021-06-21
| | | | | | | | | | * gnu/packages/video.scm (mlt)[arguments]: Adjust make-flags to use cc-for-target, cxx-for-target.
| * gnu: Add shotcut.Vinicius Monego2021-06-21
| | | | | | | | | | | | * gnu/packages/video.scm (shotcut): New variable. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| * gnu: mlt: Add optional dependencies.Vinicius Monego2021-06-21
| | | | | | | | | | | | | | * gnu/packages/video.scm (mlt)[inputs]: Add alsa-plugins:pulseaudio, libebur128, rtaudio, sdl2, sdl2-image, sox, vidstab. Remove sdl. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| * gnu: mlt: Update to 6.26.1.Vinicius Monego2021-06-21
| | | | | | | | | | | | * gnu/packages/video.scm (mlt): Update to 6.26.1. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
| * gnu: mlt: Update license.Vinicius Monego2021-06-21
| | | | | | | | | | | | * gnu/packages/video.scm (mlt)[license]: Change from gpl3 to lgpl2.1+. Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
* | 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: libaom: Omit static library.Tobias Geerinckx-Rice2021-06-19
| | | | | | | | | | * gnu/packages/video.scm (libaom)[arguments]: Add a 'delete-static-libraries phase to do so.
| * gnu: libaom: Update to 3.1.1.Tobias Geerinckx-Rice2021-06-19
| | | | | | | | * gnu/packages/video.scm (libaom): Update to 3.1.1.
| * gnu: liba52: Note the type of stream.Tobias Geerinckx-Rice2021-06-17
| | | | | | | | * gnu/packages/video.scm (liba52)[synopsis, description]: A is for audio.
| * gnu: ffmpeg: Build with the latest SRT.Marius Bakke2021-06-16
| | | | | | | | * gnu/packages/video.scm (ffmpeg)[inputs]: Change from SRT-1.4.1 to SRT.
| * 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.
| * gnu: svt-hevc: Update upstream hash.Tobias Geerinckx-Rice2021-06-12
| | | | | | | | | | | | | | The v1.5.1 was moved in place (meditate on that) but the change is harmless. See <http://issues.guix.gnu.org/48966>. * gnu/packages/video.scm (svt-hevc)[source]: Adjust hash accordingly.
| * gnu: libmediainfo: Fix usage of libcurl and libtinyxml2.Michael Rohleder2021-06-12
| | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/video.scm (libmediainfo): Fix usage of libcurl and libtinyxml2. [arguments]: Add configure-flags. [native-inputs]: Move zlib, tinyxml2, curl, libzen to ... [propagated-inputs]: ... Here. (mediainfo): [native-inputs]: Remove zlib, libzen. Move libmediainfo to ... [inputs]: ... Here. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| * gnu: youtube-dl: Update to 2021.06.06.Xinglu Chen2021-06-07
| | | | | | | | | | | | * gnu/packages/video.scm (youtube-dl): Update to 2021.06.06. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
* | Merge branch 'master' into core-updatesMarius Bakke2021-06-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * gnu: vlc: Update to 3.0.14.Solene Rapenne via Guix-patches via2021-06-06
| | | | | | | | | | | | * gnu/packages/video.scm (vlc): Update to 3.0.14. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
| * gnu: libvpx: Update to 1.10.0.Maxim Cournoyer2021-06-06
| | | | | | | | * gnu/packages/video.scm (libvpx): Update to 1.10.0.
| * gnu: libopenshot: Use ffmpeg-4.3.Maxim Cournoyer2021-06-06
| | | | | | | | | | * gnu/packages/video.scm (libopenshot) [propagated-inputs]{ffmpeg}: Downgrade to ffmpeg 4.3 to fix build.
| * gnu: Add ffmpeg-4.3.Maxim Cournoyer2021-06-06
| | | | | | | | * gnu/packages/video.scm (ffmpeg-4.3): New variable.
| * gnu: ffmpeg: Update to 4.4.Maxim Cournoyer2021-06-06
| | | | | | | | * gnu/packages/video.scm (ffmpeg): Update to 4.4.
| * gnu: rav1e: Update to 0.4.1.Maxim Cournoyer2021-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/video.scm (rav1e): Update to 0.4.1. [source]: Fix indentation. [cargo-inputs]{rust-arbitrary}: Update to 0.4. {rust-av-metrics}: New input. {rust-bitstream-io}: Update to 1. {rust-cfg-if}: Update to 1. {rust-console}: Update to 0.14. {rust-crossbeam}: New input. {rust-itertools}: Update to 0.10. {rust-libfuzzer-sys}: New input. {rust-noop-proc-macro}: Update to 0.3. {rust-paste}: Update to 1. {rust-rand}: Update to 0.8. {rust-rand-chacha}: Update to 0.3. {rust-regex}: New input. {rust-rustc-version}: Update to 0.3. {rust-signal-hook}: Update to 0.3. {rust-v-frame, rust-wasm-bindgen}: New inputs. {rust-cc: Move to... [cargo-development-inputs]: ... here. {rust-rand}: Update to 0.8. {rust-rand-chacha}: Update to 0.3. {rust-semver}: Update to 0.11. [inputs]{nasm}: Move to... [native-inputs]: ... here. This was spotted by 'guix lint'. [synopsis]: Focus on facts, toning down marketing. [description]: Expound.
| * gnu: openshot: Use free font.Leo Prikler2021-06-03
| | | | | | | | | | * gnu/packages/video.scm (openshot)[inputs]: Use font-dejavu. [patch-font-location]: Adjust accordingly.
| * gnu: vapoursynth: Update to 53.Tobias Geerinckx-Rice2021-05-30
| | | | | | | | * gnu/packages/video.scm (vapoursynth): Update to 53.
| * gnu: vapoursynth: Make python a regular input.Tobias Geerinckx-Rice2021-05-30
| | | | | | | | | | | | | | | | | | This follows up on c00b1760f605255719a525e52c268b222a1f5184, although meson-build-system's lack of cross-compilation makes it theoretical. * gnu/packages/video.scm (vapoursynth)[native-inputs]: Move python from here… [inputs]: …to here.
| * gnu: vapoursynth: Wrap with own PYTHONPATH.Tobias Geerinckx-Rice2021-05-30
| | | | | | | | | | | | | | | | This fixes, e.g., ‘vspipe -v’ in a pure environment. * gnu/packages/video.scm (vapoursynth)[arguments]: Add a 'wrap phase. Reported by maddo of #guix.
| * gnu: svt-hevc: Update to 1.5.1.Tobias Geerinckx-Rice2021-05-29
| | | | | | | | * gnu/packages/video.scm (svt-hevc): Update to 1.5.1.
* | Merge branch 'master' into core-updatesMarius Bakke2021-05-22
|\|
| * gnu: dav1d: Update to 0.9.0.Leo Famulari2021-05-20
| | | | | | | | * gnu/packages/video.scm (dav1d): Update to 0.9.0.
| * gnu: libaom: Update to 3.1.0.Leo Famulari2021-05-20
| | | | | | | | * gnu/packages/video.scm (libaom): Update to 3.1.0.
| * gnu: youtube-dl: Update to 2021.05.16.Tobias Geerinckx-Rice2021-05-18
| | | | | | | | * gnu/packages/video.scm (youtube-dl): Update to 2021.05.16.
* | Merge branch 'master' into core-updatesLudovic Courtès2021-05-15
|\|
| * gnu: mediainfo: Update to 21.03.Michael Rohleder2021-05-14
| | | | | | | | | | | | * gnu/packages/video.scm (mediainfo): Update to 21.03. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| * gnu: libmediainfo: Update to 21.03.Michael Rohleder2021-05-14
| | | | | | | | | | | | * gnu/packages/video.scm (libmediainfo): Update to 21.03. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
| * gnu: svt-av1: Update to 0.8.7.Tobias Geerinckx-Rice2021-05-13
| | | | | | | | * gnu/packages/video.scm (svt-av1): Update to 0.8.7.
* | Merge branch 'master' into core-updatesMarius Bakke2021-05-09
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm