aboutsummaryrefslogtreecommitdiff


 
                         
generated by
                             
                                 cgit
                             
                         

                        
 


/packages/zile.scm?id=d42a0f10e750905adf49bc03cde8c20e59636afd'>zile.scm

s='msg-tooltip'>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

AgeCommit message (Expand)Author


2020-11-07gnu: zile: Update to 2.4.15....* gnu/packages/zile.scm (zile): Update to 2.4.15.
Tobias Geerinckx-Rice
Marius Bakke


2021-06-14gnu: Rename qtbase to qtbase-5....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.
Maxim Cournoyer


2021-06-13gnu: keepassxc: Update to 2.6.6....* gnu/packages/password-utils.scm (keepassxc): Update to 2.6.6.
Efraim Flashner


2021-06-12gnu: password-store: Update to 1.7.4....* gnu/packages/password-utils.scm (password-store): Update to 1.7.4.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Xinglu Chen


2021-05-09Merge branch 'master' into core-updates... 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
Marius Bakke


2021-04-28gnu: keepassxc: Wrap binary with wrap-qt-program....* gnu/packages/password-utils.scm (keepassxc)[arguments]: Import
qt-utils module. Replace custom 'wrap-bin phase with 'wrap-qt phase.
Efraim Flashner


2021-04-16Merge remote-tracking branch 'origin/master' into core-updates... Conflicts:
	gnu/local.mk
	gnu/packages/boost.scm
	gnu/packages/chez.scm
	gnu/packages/compression.scm
	gnu/packages/crates-io.scm
	gnu/packages/docbook.scm
	gnu/packages/engineering.scm
	gnu/packages/gcc.scm
	gnu/packages/gl.scm
	gnu/packages/gtk.scm
	gnu/packages/nettle.scm
	gnu/packages/python-check.scm
	gnu/packages/python-xyz.scm
	gnu/packages/radio.scm
	gnu/packages/rust.scm
	gnu/packages/sqlite.scm
	guix/build-system/node.scm
Efraim Flashner


2021-03-25gnu: Remove QT 4....For more information, see:

https://lists.gnu.org/archive/html/guix-devel/2016-02/msg00596.html
https://bugs.gnu.org/45704

* gnu/packages/qt.scm (qt-4, python2-pyqt-4): Remove variables.
* gnu/packages/engineering.scm (qucs, qucs-s): Remove variables.
* gnu/packages/messaging.scm (pybitmessage): Remove variable.
* gnu/packages/password-utils.scm (keepassx): Remove variable.
* gnu/packages/pdf.scm (poppler-qt4): Remove variable.
Leo Famulari


2021-03-24Merge remote-tracking branch 'origin/master' into core-updatesEfraim Flashner


2021-03-10gnu: password-store: Update to 1.7.3-1.918992c....* gnu/packages/password-utils.scm (password-store): Update to
1.7.3-1.918992c.
[arguments]<#:phases>['wrap-path]: Add "wl-clipboard".
[inputs]: Add "wl-clipboard".

Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
Sébastien Lerique


2021-03-06Merge branch 'master' into core-updatesChristopher Baines