From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id wPEWFP7AWGZrpAAAA41jLg (envelope-from ) for ; Thu, 30 May 2024 20:10:06 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YL+2EP7AWGbAsAAA62LTzQ (envelope-from ) for ; Thu, 30 May 2024 20:10:06 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="CM/DBT9O"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1717092606; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=hgg7sWBUAA8qTotqvp/6HoZdcGS+1n9jXpTXRybyLXo=; b=X5BpIc4hKEVPrts7Pw7oJaSRbQiaGKwoPmlX9G54WL7eKet/QSO/HLqqVhL2DFD8LCpxzA 1cTeyFIrrX9BdkkuDBoZRiCHYLEm6mRWdbSmUoqVsaKzXWByN+XQkKVpgH8d2KrhG5OBJk S0K9USB05jivaEBGDXr5n4Q5+ogkqVUgOV6TXcQRqVohrqzOgMms1c5MA6pUFiE3x7GFif 0GaijXyh7T3W4/6cxiXr8aXdrRJiv2IJgcVjQp8S8WyUiHCY1vFxluM0cn9nsgLiwTFXew f12RRJdZng2/0H2RTwpabif7lUjViJltq+s2yDdQISxjqc+x7wSreKuDsDCaoQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="CM/DBT9O"; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1717092606; a=rsa-sha256; cv=none; b=t8RU0yDDutchDjE8YsFqEK2JJFbbXupJdoKEp75ayleIv9vnylb07hSbxGGRNpbgmgPGI1 ZunZbeYhJswiWtcjtpnBLdQnHhh57z95vtIKniwakB+Y6pbQr58w/76Cf0PeyT+/Mfuj4a dvaPg0ZP8fd/IUnUhUmRP1WR9lBkl2rbZCfOYqpbkiRK0h7gBh2vQfasZSH9mrPsfdMBDP uoIuHxfHHX9svDeNWIwjyI3BvOahuMMmBXKy7jGtqOfrYnT2hxo5pLGXXyLV8MQPiOFjC4 sWImjLs8MwpzReNCHSQpFJIChORE/6lde+LDhuc6V6/X9sCphrN+q7CqLRX6Sw== 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 568A1563A8 for ; Thu, 30 May 2024 20:10:05 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sCkDp-0003XX-QQ; Thu, 30 May 2024 14:09:53 -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 1sCkDo-0003XL-7G for guix-patches@gnu.org; Thu, 30 May 2024 14:09:52 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sCkDn-0005S9-VP for guix-patches@gnu.org; Thu, 30 May 2024 14:09:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sCkDy-0000xu-10 for guix-patches@gnu.org; Thu, 30 May 2024 14:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71279] [PATCH 1/3] gnu: grass: Improve package style. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 May 2024 18:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71279 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71279@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17170925813661 (code B ref -1); Thu, 30 May 2024 18:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 May 2024 18:09:41 +0000 Received: from localhost ([127.0.0.1]:49989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkDc-0000wx-IP for submit@debbugs.gnu.org; Thu, 30 May 2024 14:09:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:57984) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sCkDa-0000wn-J7 for submit@debbugs.gnu.org; Thu, 30 May 2024 14:09:39 -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 1sCkDP-0003WB-ER for guix-patches@gnu.org; Thu, 30 May 2024 14:09:27 -0400 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sCkDM-0005Qx-W8 for guix-patches@gnu.org; Thu, 30 May 2024 14:09:27 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B6AA2240027 for ; Thu, 30 May 2024 20:09:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1717092561; bh=k0zZ+b/l5RvZnZU+VY0t+G9EEhxxObSDpi66ZWrxtn4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=CM/DBT9OEvaNw5hfjiXVXA4KOl+Qf9Z4v6euEw2qd1IXCnSvPaqbAR7h6xVWnC6yq tQdbJ9x6ZOsVh9LJdlKD29gYY1+IS5DFE496rkwlSJ2h6bFKWHIfTqNDlYmmaqkPOP Jp3gwTrHna9R1dnO1CQvRlsjkNmeqJ5AgI/+CWWUWwWdV8es4nWvXw3AuOdD3fdWk2 NLt+Nqa98264BzrDK4OzTD5S0VXB9wPrZa4NjiIgAcM5q/kpkGHhnez4hZ4twcsHHB x/SGJu5LtEeymrAQAvfWDUNpv7yEDMU62NZX7yi0Ivkl5+hTEKF85AIXIfkJyfs2zv o0wXhPsbhzrZw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VqvQm50sSz6twf; Thu, 30 May 2024 20:09:20 +0200 (CEST) From: Vinicius Monego Date: Thu, 30 May 2024 18:08:50 +0000 Message-Id: <4d9e85d82fc2c3a030a0255faf2da4915450b653.1717092444.git.monego@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.67.36.65; envelope-from=monego@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 3.75 X-Spam-Score: 3.75 X-Migadu-Queue-Id: 568A1563A8 X-Migadu-Scanner: mx13.migadu.com X-TUID: eCzFKNHkK3zI * gnu/packages/geo.scm (grass)[inputs, native-inputs]: Remove package labels. [arguments]: Use G-Expressions and Gexp variables. Remove trailing #t from phases. Change-Id: Ifa2d992da5ffb14ee178ad811046ab90d6ab87cd --- gnu/packages/geo.scm | 140 +++++++++++++++++++++---------------------- 1 file changed, 68 insertions(+), 72 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c9152fb4f8..e79b2fc4b3 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2744,106 +2744,102 @@ (define-public grass (base32 "1gpfbppfajc8d6b9alw9fdzgaa83w26kl6fff1395bc9gal215ms")))) (build-system gnu-build-system) (inputs - `(("bzip2" ,bzip2) - ("cairo" ,cairo) - ("fftw" ,fftw) - ("freetype" ,freetype) - ("gdal" ,gdal) - ("geos" ,geos) - ("glu" ,glu) - ("libpng" ,libpng) - ("libtiff" ,libtiff) - ("mesa" ,mesa) - ("mariadb-dev" ,mariadb "dev") - ("mariadb-lib" ,mariadb "lib") - ("netcdf" ,netcdf) - ("openblas" ,openblas) - ("perl" ,perl) - ("postgresql" ,postgresql) - ("proj" ,proj) - ("python" ,python) - ("python-dateutil" ,python-dateutil) - ("python-numpy" ,python-numpy) - ("python-wxpython" ,python-wxpython) - ("readline" ,readline) - ("sqlite" ,sqlite) - ("wxwidgets" ,wxwidgets) - ("zlib" ,zlib) - ("zstd" ,zstd "lib"))) + (list bzip2 + cairo + fftw + freetype + gdal + geos + glu + libpng + libtiff + mesa + `(,mariadb "dev") + `(,mariadb "lib") + netcdf + openblas + perl + postgresql + proj + python + python-dateutil + python-numpy + python-wxpython + readline + sqlite + wxwidgets + zlib + `(,zstd "lib"))) (native-inputs - `(("bash" ,bash-minimal) - ("bison" ,bison) - ("flex" ,flex) - ("pkg-config" ,pkg-config))) + (list bash-minimal + bison + flex + pkg-config)) (arguments - `(#:tests? #f ; No tests - #:modules ((guix build gnu-build-system) + (list + #:tests? #f ; No tests + #:modules `((guix build gnu-build-system) ((guix build python-build-system) #:prefix python:) (guix build utils)) - #:imported-modules (,@%gnu-build-system-modules + #:imported-modules `(,@%gnu-build-system-modules (guix build python-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-lapack - (lambda _ - (substitute* "./configure" - (("-lblas") "-lopenblas") - (("-llapack") "-lopenblas")))) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((shell (search-input-file inputs "/bin/bash"))) - (setenv "SHELL" shell) - (setenv "CONFIG_SHELL" shell) - (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," - (assoc-ref outputs "out") - "/" ,grassxx "/lib"))) - (invoke "./configure" - (string-append "--prefix=" - (assoc-ref outputs "out")) - "--with-blas" - "--with-bzlib" - (string-append "--with-freetype-includes=" - (assoc-ref inputs "freetype") - "/include/freetype2") - (string-append "--with-freetype-libs=" - (assoc-ref inputs "freetype") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-lapack + (lambda _ + (substitute* "./configure" + (("-lblas") "-lopenblas") + (("-llapack") "-lopenblas")))) + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + (let ((shell (search-input-file inputs "/bin/bash"))) + (setenv "SHELL" shell) + (setenv "CONFIG_SHELL" shell) + (setenv "LDFLAGS" (string-append "-Wl,-rpath -Wl," + #$output + "/" #$grassxx "/lib"))) + (invoke "./configure" + (string-append "--prefix=" #$output) + "--with-blas" + "--with-bzlib" + (string-append "--with-freetype-includes=" + #$(this-package-input "freetype") + "/include/freetype2") + (string-append "--with-freetype-libs=" + #$(this-package-input "freetype") "/lib") "--with-geos" "--with-lapack" "--with-mysql" (string-append "--with-mysql-includes=" - (assoc-ref inputs "mariadb-dev") + (ungexp (this-package-input "mariadb") "dev") "/include/mysql") (string-append "--with-mysql-libs=" - (assoc-ref inputs "mariadb-lib") + (ungexp (this-package-input "mariadb") "lib") "/lib") "--with-netcdf" "--with-postgres" (string-append "--with-proj-share=" - (assoc-ref inputs "proj") + #$(this-package-input "proj") "/share/proj") "--with-pthread" "--with-readline" "--with-sqlite" "--with-wxwidgets"))) (add-after 'install 'install-links - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ ;; Put links for includes and libraries in the standard places. - (let* ((out (assoc-ref outputs "out")) - (dir (string-append out "/" ,grassxx))) + (let* ((dir (string-append #$output "/" #$grassxx))) (symlink (string-append dir "/include") - (string-append out "/include")) + (string-append #$output "/include")) (symlink (string-append dir "/lib") - (string-append out "/lib"))) - #t)) + (string-append #$output "/lib"))))) (add-after 'install-links 'python:wrap (assoc-ref python:%standard-phases 'wrap)) (add-after 'python:wrap 'wrap-with-python-interpreter - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/" ,grassxx) - `("GRASS_PYTHON" = (,(which "python3")))) - #t)))))) + (lambda _ + (wrap-program (string-append #$output "/bin/" #$grassxx) + `("GRASS_PYTHON" = (,(which "python3"))))))))) (synopsis "GRASS Geographic Information System") (description "GRASS (Geographic Resources Analysis Support System), is a Geographic base-commit: dc8fb5672464b6386f6b4b94723f9b36edc4e625 prerequisite-patch-id: 773c85d1be2cd6c14792cefa3855e6c2f1962c73 prerequisite-patch-id: 40dee8ca9d21c3a433af58e9bf49422620721eb1 prerequisite-patch-id: da9af05380d56f1e7aab9c9ee3853d7361982d3c prerequisite-patch-id: 86a8d9abf4ed3884ce07df56d07f3e3ccedc06d2 prerequisite-patch-id: 1b8c747f40718f0e8ef37fdc1a313aef4046e55c prerequisite-patch-id: dbb183058bd531219603f0611a88e3faae7497f8 prerequisite-patch-id: 63ad2f6e26a7a7e6e28dd8ce5fb6422b66cd2e32 prerequisite-patch-id: ccd49dc6a0012f25b975b7de0b1b389d813c0ace prerequisite-patch-id: 3f6f0ed6801942cc8f124e3a0368af7291456f31 prerequisite-patch-id: c3a135b6c179a25a56cb5b7f0158d1907b2d1105 -- 2.39.2