From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id sHQSHuujIF/BYAAA0tVLHw (envelope-from ) for ; Tue, 28 Jul 2020 22:17:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uCncGeujIF9LEQAAbx9fmQ (envelope-from ) for ; Tue, 28 Jul 2020 22:17:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 808F19400BF for ; Tue, 28 Jul 2020 22:17:14 +0000 (UTC) Received: from localhost ([::1]:36938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0XuJ-000561-5E for larch@yhetil.org; Tue, 28 Jul 2020 18:17:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0XuA-00055o-MT for guix-patches@gnu.org; Tue, 28 Jul 2020 18:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47815) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k0XuA-0004wu-Dd for guix-patches@gnu.org; Tue, 28 Jul 2020 18:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k0XuA-000559-8f for guix-patches@gnu.org; Tue, 28 Jul 2020 18:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42123] [PATCH] linux-libre: Enable module compression. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 28 Jul 2020 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42123 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 42123@debbugs.gnu.org Received: via spool by 42123-submit@debbugs.gnu.org id=B42123.159597457819451 (code B ref 42123); Tue, 28 Jul 2020 22:17:02 +0000 Received: (at 42123) by debbugs.gnu.org; 28 Jul 2020 22:16:18 +0000 Received: from localhost ([127.0.0.1]:59358 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0XtS-00053f-DT for submit@debbugs.gnu.org; Tue, 28 Jul 2020 18:16:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45024) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k0XtQ-00053O-0m for 42123@debbugs.gnu.org; Tue, 28 Jul 2020 18:16:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:34063) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0XtK-0004qf-Pq for 42123@debbugs.gnu.org; Tue, 28 Jul 2020 18:16:10 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=48394 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1k0XtJ-0005cn-FF; Tue, 28 Jul 2020 18:16:09 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200629142434.21308-1-othacehe@gnu.org> <87366atdve.fsf@gnu.org> <87lfjx6nb9.fsf@gnu.org> <873664ltqt.fsf@gnu.org> <878sfw7mec.fsf@gnu.org> <871rloiept.fsf@gnu.org> <874kqjn5k4.fsf@gnu.org> <874kqhcea1.fsf@gnu.org> <87v9i9exjq.fsf@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 Thermidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 29 Jul 2020 00:16:07 +0200 In-Reply-To: <87v9i9exjq.fsf@gnu.org> (Mathieu Othacehe's message of "Mon, 27 Jul 2020 18:24:09 +0200") Message-ID: <87tuxrqo9k.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: hqAMMnBx7rwh Hi! Mathieu Othacehe skribis: > So as you suggested I created "guile-zlib" and "guile-lzlib" which was > the easy part. The other part is the hard to digest, attached patch. Thanks for doing that! (I figured David Thompson had one wrapping the low-level bits of zlib: . We should probably incorporate that.) > I tested it running "make check", "make as-derivation", "./pre-inst-env > guix build guix". Hope I didn't miss something. Nice! > Please, tell me what you think :) Just a quick review because I=E2=80=99m headed for a break. :-) > From d0f23078d1963f9aa8facda0fb3ae40e1e8c3cf2 Mon Sep 17 00:00:00 2001 > From: Mathieu Othacehe > Date: Mon, 27 Jul 2020 16:36:39 +0200 > Subject: [PATCH] Use "guile-zlib" and "guile-lzlib" instead of (guix conf= ig). > > * Makefile.am (MODULES): Remove guix/zlib.scm and guix/lzlib.scm, > (SCM_TESTS): remove tests/zlib.scm, tests/lzlib.scm. > * build-aux/build-self.scm (make-config.scm): Remove unused %libz variabl= e. > * configure.ac: Remove LIBZ and LIBLZ variables and check instead for > Guile-zlib and Guile-lzlib. > * doc/guix.texi ("Requirements"): Remove zlib requirement and add Guile-z= lib > and Guile-lzlib instead. > * gnu/packages/package-management.scm (guix)[native-inputs]: Add "guile-z= lib" > and "guile-lzlib", > [inputs]: remove "zlib" and "lzlib", > [propagated-inputs]: ditto, > [arguments]: add "guile-zlib" and "guile-lzlib" to Guile load path. > * guix/build/download-nar.scm: Use (zlib) instead of (guix zlib). > * guix/config.scm.in (%libz, %liblz): Remove them. > * guix/cvs-download.scm (cvs-fetch): Do not stub (guix config) in imported > modules list, instead add "guile-zlib" to the extension list. > * guix/git-download.scm (git-fetch): Ditto. > * guix/gnu-maintenance.scm: Use (zlib) instead of (guix zlib). > * guix/hg-download.scm (hg-fetch): Do not stub (guix config) in imported > modules list, instead add "guile-zlib" to the extension list. > * guix/lzlib.scm: Remove it. > * guix/man-db.scm: Use (zlib) instead of (guix zlib). > * guix/profiles.scm (manual-database): Do not stub (guix config) in impor= ted > modules list, instead add "guile-zlib" to the extension list. > * guix/scripts/publish.scm: Use (zlib) instead of (guix zlib) and (lzlib) > instead of (guix lzlib), > (string->compression-type, effective-compression): do not check for zlib = and > lzlib availability. > * guix/scripts/substitute.scm (%compression-methods): Do not check for lz= lib > availability. > * guix/self.scm (specification->package): Add "guile-zlib" and "guile-lzl= ib" > and remove "zlib" and "lzlib", > (compiled-guix): remove "zlib" and "lzlib" arguments and add guile-zlib a= nd > guile-lzlib to the dependencies, also do not pass "zlib" and "lzlib" to > "make-config.scm" procedure, > (make-config.scm): remove "zlib" and "lzlib" arguments as well as %libz a= nd > %liblz variables. > * guix/utils.scm (lzip-port): Use (lzlib) instead of (guix lzlib) and do = not > check for lzlib availability. > * guix/zlib.scm: Remove it. > * m4/guix.m4 (GUIX_LIBZ_LIBDIR, GUIX_LIBLZ_FILE_NAME): Remove them. > * tests/lzlib.scm: Use (zlib) instead of (guix zlib) and (lzlib) > instead of (guix lzlib), and do not check for zlib and lzlib availability. > * tests/publish.scm: Ditto. > * tests/substitute.scm: Do not check for lzlib availability. > * tests/utils.scm: Ditto. > * tests/zlib.scm: Remove it. This can be decomposed in several steps: 1. We can start using =E2=80=98guile-zlib=E2=80=99 as extensions for gexp= s: in (guix scripts pack), (guix download), etc. Easy, no risk. 2. Use guile-zlib & co. in Guix itself: (guix scripts substitute), (guix scripts publish), etc. Keep (guix zlib) and (guix lzlib) in parallel. 3. Update =E2=80=98guix=E2=80=99 package with these two new dependencies. 4. Remove uses (guix zlib) and (guix lzlib), adjust build machinery and doc. 5. Adjust (guix self) and related code. This is a bit touchy. Perhaps there=E2=80=99s a couple of steps that can be merged, but having a = split along these lines would be clearer and better for our peace of mind. > --- a/build-aux/build-self.scm > +++ b/build-aux/build-self.scm > @@ -71,7 +71,7 @@ > (variables rest ...)))))) > (variables %localstatedir %storedir %sysconfdir %system))) >=20=20 > -(define* (make-config.scm #:key zlib gzip xz bzip2 > +(define* (make-config.scm #:key gzip xz bzip2 > (package-name "GNU Guix") > (package-version "0") > (bug-report-address "bug-guix@gnu.org") This is OK. > @@ -133,11 +133,7 @@ > (define %bzip2 > #+(and bzip2 (file-append bzip2 "/bin/bzip2"))) > (define %xz > - #+(and xz (file-append xz "/bin/xz"))) > - > - (define %libz > - #+(and zlib > - (file-append zlib "/lib/libz"))))))) > + #+(and xz (file-append xz "/bin/xz"))))))) I think it=E2=80=99s OK too, but we have to keep in mind that this code can= be run by a past Guix that expects =E2=80=98%libz=E2=80=99. Normally it=E2=80= =99s OK because the modules needed by =E2=80=98compute-guix-derivation=E2=80=99 do not rely on = =E2=80=98%libz=E2=80=99 and (guix zlib). One test would be something like: guix time-machine --commit=3D6298c3ffd9654d3231a6f25390b056483e8f407c -- \ pull -p /tmp/test --url=3D/path/to/local/repo --branch=3Dthe-branch This will check that 1.0.0 can indeed pull this new repo. The rest LGTM. Thanks a lot for all the work! Ludo=E2=80=99, who=E2=80=99s going to be away the coming weeks.