From patchwork Thu Mar 23 06:26:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Dr. Arne Babenhauserheide" X-Patchwork-Id: 48612 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DFF4716FD0; Thu, 23 Mar 2023 06:31:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5E06116FBD for ; Thu, 23 Mar 2023 06:31:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfETm-0003wR-SQ; Thu, 23 Mar 2023 02:31:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pfETW-0003vz-H2 for guix-patches@gnu.org; Thu, 23 Mar 2023 02:31:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pfETW-00033y-5d for guix-patches@gnu.org; Thu, 23 Mar 2023 02:31:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfETV-0005ZN-Nc for guix-patches@gnu.org; Thu, 23 Mar 2023 02:31:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62394] [PATCH] make more packages tunable Resent-From: "Dr. Arne Babenhauserheide" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Mar 2023 06:31:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62394 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: control@debbugs.gnu.org, 62394@debbugs.gnu.org Received: via spool by 62394-submit@debbugs.gnu.org id=B62394.167955303121362 (code B ref 62394); Thu, 23 Mar 2023 06:31:01 +0000 Received: (at 62394) by debbugs.gnu.org; 23 Mar 2023 06:30:31 +0000 Received: from localhost ([127.0.0.1]:37161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfET0-0005YO-KN for submit@debbugs.gnu.org; Thu, 23 Mar 2023 02:30:31 -0400 Received: from mout.web.de ([217.72.192.78]:59029) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfESx-0005Xz-10; Thu, 23 Mar 2023 02:30:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=web.de; s=s29768273; t=1679553017; i=arne_bab@web.de; bh=gdG5O3HzzX//K4zwUhYXVxK1AGlhgLiqmXNgtlPlSis=; h=X-UI-Sender-Class:References:From:To:Cc:Subject:Date:In-reply-to; b=FwCvLHyy/RwU4ISMpSqCEXIDEtLTiSUw5GNWMWf7bcCryfnKnUauj5ympmDJ2z8bO oa55i4M/PjHeuythjsK3Q7HuObZByHTaTEcekZzsGVzoOl/hKrP1ofOBkH5IiXfhBh l7vxCOWBy/5LRRVds5VzKrK6liCh3B/WsUIJpkrcYuI+EsKRatm184LqYmtLIZwYLI 7Oh7zYP6l83FF+MvNKNBfIOq+y/T18+WpzHgD8PGEj1tdF6EcbjYkunJfLQAHU44s8 MmBK9W/D6EnPkpgkxoNiZadkLIm3CD7DZ3YULDkz3yaKwA/UlXJDiCOmN1x7qEGtiV z/Spbt/YyYRUg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from fluss ([84.149.95.143]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1MLzit-1pwUCO2dBB-00Hy6I; Thu, 23 Mar 2023 07:30:17 +0100 References: <87h6uc8oxl.fsf@web.de> <47fc54749cd8cdfdfc9ac305745f7e9fbe7d5507.camel@gmail.com> User-agent: mu4e 1.8.13; emacs 28.1 From: "Dr. Arne Babenhauserheide" Date: Thu, 23 Mar 2023 07:26:58 +0100 In-reply-to: <47fc54749cd8cdfdfc9ac305745f7e9fbe7d5507.camel@gmail.com> Message-ID: <87v8is6kuj.fsf@web.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:EtUExc/ISqiVmkSKbKoT/RZoRM18hYAIJgwFhBUZ3Xrmg1ALsZ4 HQcpLY4iSNTdlUd3KV2C3ryl7yBCQTE54lsjjM8zqrxUU29RBHPgOiM8NSNKK3l+GOuFZaW jq49YYNtlCaKVTuTjKrnuIxdtYF7nU8YZKWMNQAkDdPwEYOV9AJKRElgpexsOnTYu/YLE8g R7ElL7cVEcPANn0UMgKow== UI-OutboundReport: notjunk:1;M01:P0:hgFjAP8SPv0=;LlgHcKP/q0+Gb4BasWqZM1soC9D FH7qmlrtlEMWdM+C/kwO3/M31TzXtmj3yOCkSc9rqPv1OaoAbv6916HX/OSiTDSnYvGZrOexj MxmXy6+FroyZNt04JnVtOZjNZfzJw8n9wRUBdFLRtLxc/yyKbRqRyju0Qqiy2nm//IVky7A3+ QRpeJvyIq/0LYME8t0VGRgJnEclLvUad2WocXE1KcMGr93OIf17Slg0/y505ZE95kG27Dq4L9 AyNrp1SnMv1QPn4A78ZvVi7DvI3RzouNnR0YmUjSBZ5bIhd0FzHMLf7JtxXv6sA3XL9JTmq9r nNyBwTvMJDXy3WzwlzoM+JahGLK8hqIEONHi0Sle8FkQAnSDLhG0NNwLzZTQNMRZnZYR0JimJ 1AkLZVtuGoZlwy/tQw1+/lO5HoslXY9c2nUIOQqPoGs1w8Yv+WMUNKEpO/wfXoeFsoYupvjQX i8nr2878L0RgQRn2qrLTT8iMd7vmpdFE6HLLTKfgCaOesTMK5Hhuz7B4JHVeRj9K+zzFbfh4l 8oPHwlZgFeURoyrCQVAuOMygSoP4KkFbZd/BdZvt/33wwiYoGEUnUiHcv9eQYeZTNbibjAxo9 i0mn7e+Bsm5YLI9WUBpj+kGnio+0KS6uihc40FDHaHw5dXDX5tm5PTuMSmj2HfjX7ZDsHHxoC QXianaZbK3LaTaafzKjWaQigEGs/fTfwcRyYh0p4Ry+qWoWGZRIjUdtpmCnJD095RiysLJ5LV Epcb7ELAxrsszJXIU0qC1zIwVU/sMC3XiIW5NVPygtYzL8eWipfVVR5NyPMHvuNM0B1JC/N+R 37FvZS7lneHr1G9awiCLqgNsA8adQMqObmJx85wOiexpyzfSW7dTmgCy2XQs+CGx/OAQKmsjE yQbtzyuMciokO7+hqO3suju3MDaGhbE0YWzYMfkfjBe9t0E5OJFL3SF5fp8TqBJ/uZVUqBs5I pNlr1PcpmFrbVIEbVvTEEq6yOcA= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Thank you for your review! Liliana Marie Prikler writes: > reassign 62394 guix-patches > thanks > >> * gnu/packages/compression.scm (zlib): add (tunable? . #t) property > Should probably be ... (zlib)[properties]: Add tunable?. > Likewise for the other packages. Thank you — fixed. >> + (properties '((tunable? . #t))) ;; advantages of Clear Linux >> over Ubuntu seen + perf: >> https://www.phoronix.com/review/zen4-clear-linux/2 >> (arguments > Don't exceed the line limit even in a comment. > Properties are supposed to be the *last* field of a package. Thank you — I moved the properties to the last field and moved the explanation and description into the commit message. A new patch is attached. Best wishes, Arne From 4e498d911ee7948bb82bbdb3c58552c67bbc3832 Mon Sep 17 00:00:00 2001 From: Arne Babenhauserheide Date: Wed, 22 Mar 2023 12:57:15 +0100 Subject: [PATCH] gnu: make more packages tunable * gnu/packages/compression.scm (zlib)[properties]: add tunable?. * gnu/packages/geo.scm (gdal)[properties]: add tunable?. * gnu/packages/java.scm (openjdk19, openjdk14)[properties]: add tunable?. * gnu/packages/maths.scm (hdf5-1.8, netcdf)[properties]: add tunable?. * gnu/packages/protobuf.scm (protobuf)[properties]: add tunable?. advantages of Clear Linux over Ubuntu seen + perf: https://www.phoronix.com/review/zen4-clear-linux/2 --- gnu/packages/chromium.scm | 17 ++++++++--------- gnu/packages/compression.scm | 8 ++++++-- gnu/packages/geo.scm | 1 + gnu/packages/gnuzilla.scm | 1 + gnu/packages/java.scm | 2 ++ gnu/packages/maths.scm | 2 ++ gnu/packages/protobuf.scm | 1 + gnu/packages/video.scm | 12 ++++++++---- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index 94e22d8c21..395834895d 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -960,14 +960,6 @@ (define-public ungoogled-chromium (variable "CHROMIUM_EXTENSION_DIRECTORY") (separator #f) ;single entry (files '("share/chromium/extensions"))))) - - ;; Building Chromium takes ... a very long time. On a single core, a busy - ;; mid-end x86 system may need more than 24 hours to complete the build. - (properties '((timeout . 144000) ;40 hours - ;; The linking step may take more than an hour on some hardware. - (max-silent-time . 7200) - (cpe-name . "chrome"))) - (home-page "https://github.com/Eloston/ungoogled-chromium") (description "Ungoogled-Chromium is the Chromium web browser, with some functionality @@ -986,7 +978,14 @@ (define-public ungoogled-chromium license:isc (license:non-copyleft "chrome://credits" "See chrome://credits for more information.") - license:lgpl2.1+)))) + license:lgpl2.1+)) + ;; Building Chromium takes ... a very long time. On a single core, a busy + ;; mid-end x86 system may need more than 24 hours to complete the build. + (properties '((timeout . 144000) ;40 hours + ;; The linking step may take more than an hour on some hardware. + (max-silent-time . 7200) + (tunable? . #t) + (cpe-name . "chrome"))))) (define-public ungoogled-chromium/wayland (package diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index e58fd65e49..cedc45ddd1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -118,6 +118,7 @@ (define-public zlib "18dighcs333gsvajvvgqp8l4cx7h1x7yx9gd5xacnk80spyykrf3")))) (build-system gnu-build-system) (outputs '("out" "static")) + (properties '((tunable? . #t))) (arguments `(#:make-flags ,(if (target-mingw?) @@ -911,7 +912,8 @@ (define-public lz4 time for compression ratio.") ;; The libraries (lz4, lz4hc, and xxhash) are BSD licenced. The command ;; line interface programs (lz4, fullbench, fuzzer, datagen) are GPL2+. - (license (list license:bsd-2 license:gpl2+)))) + (license (list license:bsd-2 license:gpl2+)) + (properties '((tunable? . #t))))) (define-public squashfs-tools (package @@ -1719,7 +1721,9 @@ (define-public zstd license:gpl3+ ; tests/gzip/*.sh license:expat ; lib/dictBuilder/divsufsort.[ch] license:public-domain ; zlibWrapper/examples/fitblk* - license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h} + license:zlib)) ; zlibWrapper/{gz*.c,gzguts.h} + (properties '((tunable? . #t))))) + (define-public pzstd (package/inherit zstd diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 753ab558ad..659ac76afe 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1068,6 +1068,7 @@ (define-public gdal "frmts/zlib" "ogr/ogrsf_frmts/geojson/libjson")))))) (build-system cmake-build-system) + (properties '((tunable? . #t))) (arguments `(#:tests? #f #:configure-flags diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 253b8c285c..5ad4ca68d3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1104,6 +1104,7 @@ (define (runpaths-of-input label) (license license:mpl2.0) ;and others, see toolkit/content/license.html (properties `((ftp-directory . "/gnu/gnuzilla") + (tunable? . #t) (cpe-name . "firefox_esr") (cpe-version . ,(first (string-split version #\-))))))) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index de3a0003e5..51ee64edfb 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1461,6 +1461,7 @@ (define-public openjdk15 (snippet #f) (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) + (properties '((tunable? . #t))) (inputs (modify-inputs (package-inputs base) (append libxcursor))) ;for our patch to work @@ -1495,6 +1496,7 @@ (define-public openjdk18 (define-public openjdk19 (make-openjdk openjdk18 "19.0.1" "0kyalb391znw6idmfn3dsx6c2mal1hl63f0bwa4mlnsxfl380bi1" + (properties '((tunable? . #t))) (arguments (substitute-keyword-arguments (package-arguments openjdk18) ((#:phases phases) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 238352f278..33bf95964f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1307,6 +1307,7 @@ (define-public hdf5-1.8 (sha256 (base32 "194ki2s5jrgl4czkvy5nc9nwjyapah0fj72l0gb0aysplp38i6v8")) (patches (search-patches "hdf5-config-date.patch")))) + (properties '((tunable? . #t))) (build-system gnu-build-system) (inputs (list zlib)) @@ -1886,6 +1887,7 @@ (define-public netcdf ("libxml2" ,libxml2) ("unzip" ,unzip) ("zlib" ,zlib))) + (properties '((tunable? . #t))) (arguments `(#:configure-flags '("--enable-doxygen" "--enable-dot" diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm index b580f8b2a7..c7d2ec06a0 100644 --- a/gnu/packages/protobuf.scm +++ b/gnu/packages/protobuf.scm @@ -110,6 +110,7 @@ (define-public protobuf (outputs (list "out" "static")) ; ~12 MiB of .a files (build-system cmake-build-system) + (properties '((tunable? . #t))) (arguments (list ;; TODO: Add the BUILD_SHARED_LIBS flag to cmake-build-system. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 73d0c1ca54..532fdfa65e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -882,7 +882,8 @@ (define-public libaom (synopsis "AV1 video codec") (description "Libaom is the reference implementation of AV1. It includes a shared library and encoder and decoder command-line executables.") - (license license:bsd-2))) + (license license:bsd-2) + (properties '((tunable? . #t))))) (define-public libmpeg2 (package @@ -1346,7 +1347,8 @@ (define-public x265 (synopsis "Library for encoding h.265/HEVC video streams") (description "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.") - (license license:gpl2+))) + (license license:gpl2+) + (properties '((tunable? . #t))))) (define-public libass (package @@ -1790,7 +1792,8 @@ (define-public ffmpeg-5 (description "FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. It includes the libavcodec audio/video codec library.") - (license license:gpl2+))) + (license license:gpl2+) + (properties '((tunable? . #t))))) (define-public ffmpeg-4 (package @@ -5024,7 +5027,8 @@ (define-public dav1d (synopsis "AV1 decoder") (description "dav1d is a new AV1 cross-platform decoder, and focused on speed and correctness.") - (license license:bsd-2))) + (license license:bsd-2) + (properties '((tunable? . #t))))) (define-public wlstream (let ((commit "182076a94562b128c3a97ecc53cc68905ea86838") -- 2.39.2