From patchwork Fri Feb 15 07:04:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivan Petkov X-Patchwork-Id: 1092 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 846B616BDC; Fri, 15 Feb 2019 07:06:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E4F9D16B87 for ; Fri, 15 Feb 2019 07:06:11 +0000 (GMT) Received: from localhost ([127.0.0.1]:33602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guXZb-0002Wv-DR for patchwork@mira.cbaines.net; Fri, 15 Feb 2019 02:06:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guXZV-0002VS-0b for guix-patches@gnu.org; Fri, 15 Feb 2019 02:06:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guXZS-0004v5-U0 for guix-patches@gnu.org; Fri, 15 Feb 2019 02:06:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49252) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guXZS-0004up-Pi for guix-patches@gnu.org; Fri, 15 Feb 2019 02:06:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1guXZS-000337-DV for guix-patches@gnu.org; Fri, 15 Feb 2019 02:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34483] [PATCH] gnu: rust: remove dependency on cargo-build-system module Resent-From: Ivan Petkov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 15 Feb 2019 07:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34483 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34483@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.155021432411679 (code B ref -1); Fri, 15 Feb 2019 07:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Feb 2019 07:05:24 +0000 Received: from localhost ([127.0.0.1]:48533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1guXYi-000327-Vx for submit@debbugs.gnu.org; Fri, 15 Feb 2019 02:05:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1guXYa-00031i-Mu for submit@debbugs.gnu.org; Fri, 15 Feb 2019 02:05:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:52364) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1guXYV-000472-BY for submit@debbugs.gnu.org; Fri, 15 Feb 2019 02:05:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guXYT-0002Lw-GO for guix-patches@gnu.org; Fri, 15 Feb 2019 02:05:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guXYR-00043b-QA for guix-patches@gnu.org; Fri, 15 Feb 2019 02:05:01 -0500 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:39984) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guXYR-0003kx-Fs for guix-patches@gnu.org; Fri, 15 Feb 2019 02:04:59 -0500 Received: by mail-pf1-x434.google.com with SMTP id h1so4390376pfo.7 for ; Thu, 14 Feb 2019 23:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:date:subject:cc:to :message-id; bh=GIGQ3KIMEP2ub7mUiecQm/ElVvdhM5UhMRhpspRo0lA=; b=ZAzFUsX4aDexM1vvBrMKZHm958zvQm/vVsL4rImnvs2FV4SV64kYSleJ5/MsEu2X4B LnQNuwmUcIWm/wnSVzE3kc93O4OxiMsNlhEx1JLEhF8Hyr6S4hWgJqf/L+DyVt3Iq/mj tBgCUgK7hEVrsR02wPrb1BsItRFFkv6cxvK4w4X7ZKptd0PPE26RVEFr8gTWT1BtpdIf iJfuehHW7AL5p4ip3RGRaPc0BtOzEzK+pOo47i8qssmLW+R3iqzoaGcLHcbjZ4MtLKWO 1gJMx/hN3XtvteW+g41OQ88KOECLwYdTYS5QHNWn/GDWHZ2DsKvlcK3IEXjxlnKPlQbQ 8FvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version:date :subject:cc:to:message-id; bh=GIGQ3KIMEP2ub7mUiecQm/ElVvdhM5UhMRhpspRo0lA=; b=A636x/C+8EieAaINKRUoZh5kq/A1UV0uJgTgSq8cWJPAAOgzu0TkZCiP7FhuQSvInP czfMO0BPLLl2PifS+8JKXy4wkE7BX84y43yecwsKyoK/wY44KYRQ+5kLCC6xvl6fcxcc DNwkzWLCNvLy9yaV9FhJ5PQGGJll5ueDJ4s9ZO6mTUfVbqGLIlGXiVgxPp5tqryp5nr/ Ogx824HJDR659e5QwH0cl+8TWIPaSkLoDcTA221xi/D+0mJyCG2ynLppQqfaxB7boT0W 5tPR8FwYEEylRPxlPqvdTiKy1xxIfeklsDWkcwoap8tiGJ0uQoPBDmHnftXzkpuweOdy X0hw== X-Gm-Message-State: AHQUAuayBeioNPyQDkRCW63ORFf/oZNZlJ/yWwqJNxThejttT0eKHGgL eHYjcTs6VG0IwGk6T7ZJL12l1zqNBF8= X-Google-Smtp-Source: AHgI3IbbKaw5vdiSeg3uMJsA4ZcHLVniMD71ccsaR6nVdrl4GJ4vnIDzcKHNs9OInZX05/2SLr08aQ== X-Received: by 2002:a62:5287:: with SMTP id g129mr8518758pfb.22.1550214270403; Thu, 14 Feb 2019 23:04:30 -0800 (PST) Received: from ?IPv6:2601:602:9a00:1784:44da:b539:4cd0:4ae5? ([2601:602:9a00:1784:44da:b539:4cd0:4ae5]) by smtp.gmail.com with ESMTPSA id v15sm5186644pgf.75.2019.02.14.23.04.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 23:04:29 -0800 (PST) From: Ivan Petkov Mime-Version: 1.0 (Mac OS X Mail 11.5 \(3445.9.1\)) Date: Thu, 14 Feb 2019 23:04:28 -0800 Message-Id: <6848286F-9931-4C37-8F05-AEF0D14E66F8@gmail.com> X-Mailer: Apple Mail (2.3445.9.1) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches * Makefile.am (guix/build/cargo-utils.scm): add it * guix/build/cargo-utils.scm: Add new module for standalone cargo utilities * guix/build-system/cargo.scm (%cargo-utils-modules): define a list of modules which (guix build cargo-utils) depends on (%cargo-build-system-modules): change it to depend on %cargo-utils-modules * guix/build/cargo-build-system.scm (file-sha256): move it to (guix build cargo-utils) (generate-checksums): move it to (guix build cargo-utils) * gnu/packages/rust.scm (rust-1.19.0): [imported-modules]: change to using %cargo-utils-modules ['patch-cargo-checksums]: import (guix build cargo-utils) instead of (guix build cargo-build-system) * gnu/packages/gnuzilla.scm (icecat): [imported-modules]: change to using %cargo-utils-modules ['patch-cargo-checksums]: import (guix build cargo-utils) instead of (guix build cargo-build-system) --- Makefile.am | 1 + gnu/packages/gnuzilla.scm | 7 ++-- gnu/packages/rust.scm | 5 ++- guix/build-system/cargo.scm | 9 ++++- guix/build/cargo-build-system.scm | 39 +----------------- guix/build/cargo-utils.scm | 67 +++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 43 deletions(-) create mode 100644 guix/build/cargo-utils.scm diff --git a/Makefile.am b/Makefile.am index fec9800ce..1083ee2ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,7 @@ MODULES = \ guix/build/download.scm \ guix/build/download-nar.scm \ guix/build/cargo-build-system.scm \ + guix/build/cargo-utils.scm \ guix/build/cmake-build-system.scm \ guix/build/dub-build-system.scm \ guix/build/dune-build-system.scm \ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1f299a2b1..e5006e4bf 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ricardo Wurmus +;;; Copyright © 2019 Ivan Petkov ;;; ;;; This file is part of GNU Guix. ;;; @@ -865,8 +866,6 @@ from forcing GEXP-PROMISE." ;; practice somehow. See . #:validate-runpath? #f - #:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' - #:configure-flags `("--enable-default-toolkit=cairo-gtk3" "--with-distribution-id=org.gnu" @@ -938,6 +937,8 @@ from forcing GEXP-PROMISE." ;; "--with-system-png" ) + #:imported-modules ,%cargo-utils-modules ;for `generate-checksums' + #:modules ((ice-9 ftw) (ice-9 rdelim) (ice-9 match) @@ -977,7 +978,7 @@ from forcing GEXP-PROMISE." (invoke "sh" "-c" "autoconf old-configure.in > old-configure"))) (add-after 'patch-source-shebangs 'patch-cargo-checksums (lambda _ - (use-modules (guix build cargo-build-system)) + (use-modules (guix build cargo-utils)) (let ((null-file "/dev/null") (null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855")) (substitute* '("Cargo.lock" "servo/Cargo.lock") diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 179689973..3cb64795b 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Danny Milosavljevic +;;; Copyright © 2019 Ivan Petkov ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,7 +195,7 @@ safety and thread safety guarantees.") (properties '((timeout . 72000) ;20 hours (max-silent-time . 18000))) ;5 hours (for armel) (arguments - `(#:imported-modules ,%cargo-build-system-modules ;for `generate-checksums' + `(#:imported-modules ,%cargo-utils-modules ;for `generate-checksums' #:modules ((guix build utils) (ice-9 match) (guix build gnu-build-system)) #:phases (modify-phases %standard-phases @@ -273,7 +274,7 @@ test = { path = \"../libtest\" } (string-append name "\"" ,%cargo-reference-hash "\""))) (for-each (lambda (filename) - (use-modules (guix build cargo-build-system)) + (use-modules (guix build cargo-utils)) (delete-file filename) (let* ((dir (dirname filename))) (display (string-append diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm index 4a1eb0cfa..7ff4e90f7 100644 --- a/guix/build-system/cargo.scm +++ b/guix/build-system/cargo.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Andreas Enge ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2016 David Craven +;;; Copyright © 2019 Ivan Petkov ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,6 +31,7 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (%cargo-build-system-modules + %cargo-utils-modules cargo-build-system crate-url crate-url? @@ -49,10 +51,15 @@ to NAME and VERSION." (let ((rust (resolve-interface '(gnu packages rust)))) (module-ref rust 'rust))) +(define %cargo-utils-modules + ;; Build-side modules imported by default. + `((guix build cargo-utils) + ,@%gnu-build-system-modules)) + (define %cargo-build-system-modules ;; Build-side modules imported by default. `((guix build cargo-build-system) - ,@%gnu-build-system-modules)) + ,@%cargo-utils-modules)) (define* (cargo-build store name inputs #:key diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index f52444f61..20087fa6c 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -20,6 +20,7 @@ (define-module (guix build cargo-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) + #:use-module (guix build cargo-utils) #:use-module (ice-9 popen) #:use-module (ice-9 rdelim) #:use-module (ice-9 ftw) @@ -28,8 +29,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases - cargo-build - generate-checksums)) + cargo-build)) ;; Commentary: ;; @@ -107,41 +107,6 @@ directory = '" port) (zero? (system* "cargo" "test")) #t)) -(define (file-sha256 file-name) - "Calculate the hexdigest of the sha256 checksum of FILE-NAME and return it." - (let ((port (open-pipe* OPEN_READ - "sha256sum" - "--" - file-name))) - (let ((result (read-delimited " " port))) - (close-pipe port) - result))) - -(define (generate-checksums dir-name src-name) - "Given DIR-NAME, a store directory, checksum all the files in it one -by one and put the result into the file \".cargo-checksum.json\" in -the same directory. Also includes the checksum of an extra file -SRC-NAME as if it was part of the directory DIR-NAME with name -\"package\"." - (let* ((file-names (find-files dir-name ".")) - (dir-prefix-name (string-append dir-name "/")) - (dir-prefix-name-len (string-length dir-prefix-name)) - (checksums-file-name (string-append dir-name "/.cargo-checksum.json"))) - (call-with-output-file checksums-file-name - (lambda (port) - (display "{\"files\":{" port) - (let ((sep "")) - (for-each (lambda (file-name) - (let ((file-relative-name (string-drop file-name dir-prefix-name-len))) - (display sep port) - (set! sep ",") - (write file-relative-name port) - (display ":" port) - (write (file-sha256 file-name) port))) file-names)) - (display "},\"package\":" port) - (write (file-sha256 src-name) port) - (display "}" port))))) - (define (touch file-name) (call-with-output-file file-name (const #t))) diff --git a/guix/build/cargo-utils.scm b/guix/build/cargo-utils.scm new file mode 100644 index 000000000..6af572e61 --- /dev/null +++ b/guix/build/cargo-utils.scm @@ -0,0 +1,67 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2016 David Craven +;;; Copyright © 2017 Mathieu Othacehe +;;; Copyright © 2019 Ivan Petkov +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build cargo-utils) + #:use-module (guix build utils) + #:use-module (ice-9 popen) + #:use-module (ice-9 rdelim) + #:export (generate-checksums)) + +;; Commentary: +;; +;; Stand alone utilities for building Rust crates or the compiler itself, +;; without depending on the entire cargo build-system itself. +;; +;; Code: + +(define (file-sha256 file-name) + "Calculate the hexdigest of the sha256 checksum of FILE-NAME and return it." + (let ((port (open-pipe* OPEN_READ + "sha256sum" + "--" + file-name))) + (let ((result (read-delimited " " port))) + (close-pipe port) + result))) + +(define (generate-checksums dir-name src-name) + "Given DIR-NAME, a store directory, checksum all the files in it one +by one and put the result into the file \".cargo-checksum.json\" in +the same directory. Also includes the checksum of an extra file +SRC-NAME as if it was part of the directory DIR-NAME with name +\"package\"." + (let* ((file-names (find-files dir-name ".")) + (dir-prefix-name (string-append dir-name "/")) + (dir-prefix-name-len (string-length dir-prefix-name)) + (checksums-file-name (string-append dir-name "/.cargo-checksum.json"))) + (call-with-output-file checksums-file-name + (lambda (port) + (display "{\"files\":{" port) + (let ((sep "")) + (for-each (lambda (file-name) + (let ((file-relative-name (string-drop file-name dir-prefix-name-len))) + (display sep port) + (set! sep ",") + (write file-relative-name port) + (display ":" port) + (write (file-sha256 file-name) port))) file-names)) + (display "},\"package\":" port) + (write (file-sha256 src-name) port) + (display "}" port)))))