01/03: Merge branch 'master' into core-updates

2024-01-07 Thread guix-commits
civodul pushed a commit to branch core-updates in repository guix. commit b71d2ba8785e9883f4f2d239c557c9034b6be876 Merge: c5d670308c 5f8a993aa8 Author: Ludovic Courtès AuthorDate: Sun Jan 7 21:17:02 2024 +0100 Merge branch 'master' into core-updates Change-Id: I150b4077fffca97c86043

01/03: Merge branch 'master' into core-updates-frozen

2021-09-07 Thread guix-commits
civodul pushed a commit to branch core-updates-frozen in repository guix. commit d9dfbf886ddbb92dfdaa118bb9765e78aad5c53a Merge: b949f34 49922ef Author: Ludovic Courtès AuthorDate: Tue Sep 7 11:04:44 2021 +0200 Merge branch 'master' into core-updates-frozen .guix-authorizations

01/03: Merge branch 'master' into core-updates

2021-05-22 Thread guix-commits
mbakke pushed a commit to branch core-updates in repository guix. commit 4ea6852c5ff1606cf6848f3ddbb669120b228c13 Merge: fcf45f8 d4ffa96 Author: Marius Bakke AuthorDate: Sat May 22 17:21:57 2021 +0200 Merge branch 'master' into core-updates Makefile.am

01/03: Merge branch 'master' into core-updates

2021-05-15 Thread guix-commits
civodul pushed a commit to branch core-updates in repository guix. commit 25487c3fe6a41dd62f6e53f256392224a3be2a08 Merge: 4a9597e 46eac03 Author: Ludovic Courtès AuthorDate: Sat May 15 22:55:24 2021 +0200 Merge branch 'master' into core-updates .gitignore

01/03: Merge branch 'master' into core-updates

2020-03-26 Thread guix-commits
mbakke pushed a commit to branch core-updates in repository guix. commit 18af6870370226b4d502d7372844e7f2aded5887 Merge: 0ab8ad4 3089b70 Author: Marius Bakke AuthorDate: Fri Mar 27 00:12:15 2020 +0100 Merge branch 'master' into core-updates Conflicts: gnu/packages/icu4c.scm

01/03: Merge branch 'master' into core-updates

2019-06-13 Thread guix-commits
civodul pushed a commit to branch core-updates in repository guix. commit d9bbfe042e06df35c12e4b8f53bfb1889cba90bf Merge: f87a7cc 47f2168 Author: Ludovic Courtès Date: Thu Jun 13 13:24:35 2019 +0200 Merge branch 'master' into core-updates .dir-locals.el

01/03: Merge branch 'master' into core-updates

2018-12-20 Thread guix-commits
civodul pushed a commit to branch core-updates in repository guix. commit 86974d8a9247cbeb938b5202f23ccca8d9ed627d Merge: 03a45a4 9012d22 Author: Ludovic Courtès Date: Thu Dec 20 18:39:04 2018 +0100 Merge branch 'master' into core-updates Makefile.am

01/03: Merge branch 'master' into core-updates

2018-08-27 Thread Marius Bakke
mbakke pushed a commit to branch core-updates in repository guix. commit 61fca0fd22b81bcc0201a336a02cac74b42c6a44 Merge: 57dac1e 526ce41 Author: Marius Bakke Date: Tue Aug 28 01:22:24 2018 +0200 Merge branch 'master' into core-updates .mailmap |

01/03: Merge branch 'master' into core-updates

2018-04-21 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates in repository guix. commit c52872bfc418c6b2273f973dff8003ca9e062792 Merge: 65bb227 3fe49e5 Author: Mark H Weaver Date: Sat Apr 21 04:57:29 2018 -0400 Merge branch 'master' into core-updates .gitignore |

01/03: Merge branch 'master' into core-updates

2018-02-14 Thread Mark H. Weaver
mhw pushed a commit to branch core-updates in repository guix. commit 932c98326daa26657c970e38583f7904364cdd66 Merge: 870541d 7553832 Author: Mark H Weaver Date: Wed Feb 14 03:40:08 2018 -0500 Merge branch 'master' into core-updates .gitignore | 1 + doc/guix.texi

01/03: Merge branch 'master' into core-updates

2018-02-01 Thread Marius Bakke
mbakke pushed a commit to branch core-updates in repository guix. commit bee7bb315cd0b4529a4117b6220c29ca297fc023 Merge: c2f0e5a 8a46443 Author: Marius Bakke Date: Thu Feb 1 13:18:47 2018 +0100 Merge branch 'master' into core-updates Makefile.am|

01/03: Merge branch 'master' into core-updates

2017-11-02 Thread Marius Bakke
mbakke pushed a commit to branch core-updates in repository guix. commit b4c22f25468cbb0b1644194381b25c795502bc16 Merge: 5146f22 77576be Author: Marius Bakke Date: Thu Nov 2 22:24:24 2017 +0100 Merge branch 'master' into core-updates doc/guix.texi |

01/03: Merge branch 'master' into core-updates

2017-10-22 Thread Marius Bakke
mbakke pushed a commit to branch core-updates in repository guix. commit 119a749db9c9847e0766860c17109b0f0b6bf349 Merge: 530d9e1 2566927 Author: Marius Bakke Date: Sun Oct 22 20:12:52 2017 +0200 Merge branch 'master' into core-updates Makefile.am|

01/03: Merge branch 'master' into core-updates

2017-10-10 Thread Marius Bakke
mbakke pushed a commit to branch core-updates in repository guix. commit c01ef97594a8b06e884906a5efbdfacf8ba33dc3 Merge: 86d02fa 4b8b441 Author: Marius Bakke Date: Tue Oct 10 22:33:28 2017 +0200 Merge branch 'master' into core-updates .mailmap |