From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: core-updates merged! Date: Wed, 3 Aug 2016 00:04:46 -0400 Message-ID: <20160803040446.GA23535@jasmine> References: <20160801081958.GA2211@solar> <87lh0ggnyt.fsf@gnu.org> <87invje1yx.fsf@we.make.ritual.n0.is> <87invj84bc.fsf@gnu.org> <20160802174821.GA29590@jasmine> <874m7297xg.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0F1p//8PRICkK4MW" Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUnQa-0003se-8n for guix-devel@gnu.org; Wed, 03 Aug 2016 00:05:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUnQV-0000zm-4m for guix-devel@gnu.org; Wed, 03 Aug 2016 00:05:07 -0400 Content-Disposition: inline In-Reply-To: <874m7297xg.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org --0F1p//8PRICkK4MW Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Tue, Aug 02, 2016 at 11:28:59PM +0200, Ludovic Courtès wrote: > Leo Famulari skribis: > Otherwise LGTM; could you push it to core-updates-next? I merged master into core-updates-next and made the change in a subsequent commit. Unfortunately, I can't push the branch to Savannah because it contains the following unsigned commits (one of them is mine, oops!): f21403e2b6f5a9491937a0cc9f31fc113998ce5e 9bc84dfea9560c497c91863e7b5021860bd3c254 745ad37a780b28f72ac9dfcc8092317e577e51c9 2d74d94b17b23ab95072da68553d85ac0b3bfede aebd383d04b351465cfb14e4fd0949b67d4b282e What should we do? In the meantime, you can inspect the updated branch on my personal Git repo: https://github.com/lfam/guix/commits/core-updates-next And, since these big merge commits make me nervous, I made notes of all the conflicts that I had to resolve. They are attached. --0F1p//8PRICkK4MW Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=conflicts Before merge, core-updates-next HEAD was ef21276053b980c9eca8df027408ae85bd6af3d8 (gnu packages admin): No change on core-updates next, package di added on master. (gnu packages base): The "previous" glibc package, used to provide locales for the previously packaged glibc, was named for 2.21 instead of 2.22. (gnu packages bioinformatics): Package diamond was on version 0.8.7 instead of master's 0.8.17. Package vsearch was at version 2.0.0 instead of master's 2.0.1. (gnu packages commencement): New private packages bison-boot0 and flex-boot0 present on core-updates-next but not on master. Conflict between 'kernel-headers-boot0' and 'linux-libre-headers-boot0'. Picked the former since it was deliberately introduced relatively recently. (gnu packages cross-base): Conflict between xheaders and xlinux-headers. Chose xheaders. (gnu packages crypto): Annoying conflict due to alphabetization of module imports. A few conflicts regarding license prefixes. (gnu packages databases): Version conflict for sqlite. (gnu packages dav): Version conflict for vdirsyncer. (gnu packages emacs): New packages not found on HEAD (why is this a conflict?) (gnu packages game-development): New packages not found on HEAD. (gnu packages games): New packages not found on HEAD. (gnu packages guile): New packages not found on HEAD. (gnu packages haskell): Period-at-end-of-synopsis conflict. (gnu packages imagemagick): Version conflict for imagemagick. (gnu packages linux): Version conflicts in linux-libres. (gnu packages music): Version conflict in beets. (gnu packages password-utils): Conflict in authorship lines. (gnu packages perl): Conflict in authorship lines. (gnu packages python): Conflict in authorship lines. Many conflicts due to iyzsong's input rearranging blitz. Took all the new arrangements. Conflict in wrap-python3. Took HEAD, which wraps more things. (gnu packages scheme): Conflict related to introduction of ghostscript-gs. Took master. (gnu packages tex): Version conflicts in texlive packages. Took latest. (gnu packages tls): Version conflict in gnutls. (gnu packages version-control): Version conflict in git. (gnu packages video): New configure flags for mpv from master. (gnu packages xorg): Conflict in authorship lines. gnu/local.mk: HEAD did not have patch 'mysql-fix-failing-test.patch' (gnu tests): master exports more marionette-related variables. guix/config.scm.in: Related to 0b0086e (config: Export the raw installation directories.). Took master. (guix packages): Related to 1929fdba (packages: no longer has an 'imported-modules' field.). Took master. (gnu tests base): Related to d2fa61bc (tests: Add Avahi and NSS-mDNS test.). Took master. Took master for all conflicts, since no work had been done on core-updates-next. (gnu tests install): Took master for all conflicts, since no work had been done on core-updates-next. doc/guix.texi: The mcron documentation was duplicated for some reason. Git did not report this conflict. I discovered it when `make` failed. --0F1p//8PRICkK4MW--