From patchwork Sun Oct 23 10:04:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 43925 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 0532627BBEA; Mon, 24 Oct 2022 03:54:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 C872427BBE9 for ; Mon, 24 Oct 2022 03:54:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omm8W-0003XF-QR for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 21:20:16 -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 1omY1Y-0004gN-8v for guix-patches@gnu.org; Sun, 23 Oct 2022 06:16:08 -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 1omY1V-0000FO-9n for guix-patches@gnu.org; Sun, 23 Oct 2022 06:16:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omY1V-0004CY-4Q for guix-patches@gnu.org; Sun, 23 Oct 2022 06:16:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58614] [PATCH v2 190/192] gnu: rust-swc-1: Move to rust-apps. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Oct 2022 10:16:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58614 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58614@debbugs.gnu.org Cc: Efraim Flashner Received: via spool by 58614-submit@debbugs.gnu.org id=B58614.166652012116019 (code B ref 58614); Sun, 23 Oct 2022 10:16:05 +0000 Received: (at 58614) by debbugs.gnu.org; 23 Oct 2022 10:15:21 +0000 Received: from localhost ([127.0.0.1]:43648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omY0m-0004AC-AW for submit@debbugs.gnu.org; Sun, 23 Oct 2022 06:15:21 -0400 Received: from mail-ed1-f53.google.com ([209.85.208.53]:33762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omY0b-00047G-BL for 58614@debbugs.gnu.org; Sun, 23 Oct 2022 06:15:11 -0400 Received: by mail-ed1-f53.google.com with SMTP id a13so21423484edj.0 for <58614@debbugs.gnu.org>; Sun, 23 Oct 2022 03:15:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=eQ4/CUd5p9l7FTCG01GAyiLpzqBZrC2jhd2keufE42w=; b=VLLI4djpXQm9auMlgmXJxvEATlR2MkI1avqKSItkrcFyk07LcAHeEmU63VJt7zTLjI zpx4Wx6qGwQiLAGSRrtwei/Lc/TweS5tLEqxQd0UHs8x/dnR87pSVoVgweevcYrZtikh bKJ00MI9T5hKf36Iu+87xxfc/zhcqhxote7PNLCYrtz3FEGOG0S55bvquBuVtr7N79Kg QYI+eFjbLRaJMt6LopqIdO9lnFve4WasVcAOBX9SKhpQedNxIGG4iD+n595x5nq7RwKZ WrXeEhvbzYuNVqbECPb6DEVQdZ3UclOOY7mVXK1vAdtMD3P6cBKaeYyyNYz/RwgqlVa1 F8zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eQ4/CUd5p9l7FTCG01GAyiLpzqBZrC2jhd2keufE42w=; b=J+iamT8FdcUH+zcn95qhDaHqMQpgjYqABPSDIe85CLRUwzSDJmoxepvUNOzHftUVxT 7PxzQS/h+bzkuwWrPv7lUDePtriNzUSjiG2oHi66G4XRp+60zV3egnzMVTAnqrI1ArJb +7/SVD72XRbJffAoHCneqYpHBMWUeJZWLTA4lNCdsZ/nwyL2rq52vYo7VNfYi9526kZL GXReEbIfwE22F312SK0N2ffU0csc/sieHYbreBu4xke3L2Abqscl6fPvkp06EKLkVJnP Sd6F4uYyCyXumGrjNnJaQRyzP1Jz9q6ZKlkac0ap0cTHtz93C3bJzIqRX6zcu6Gwo/q5 AQ4Q== X-Gm-Message-State: ACrzQf1Cid6nEHJTIY3XkYW7fLSszB2hOgtr4mtHkgMsKU4fy83PvC/H Ti5QYO+tIwmqugX0wByPKZ//yH2MbU3p9V1X X-Google-Smtp-Source: AMsMyM5k196QSkcBvWvoBnreFh+OpwIGZXMfMZHAAtkS82TeucX50eu6u/XTid0Cz062+D9q6EotGQ== X-Received: by 2002:a17:907:9491:b0:7a1:8372:5307 with SMTP id dm17-20020a170907949100b007a183725307mr4789456ejc.319.1666520103637; Sun, 23 Oct 2022 03:15:03 -0700 (PDT) Received: from localhost ([141.226.13.62]) by smtp.gmail.com with ESMTPSA id g10-20020aa7c84a000000b0045cbe305be1sm16336855edt.49.2022.10.23.03.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Oct 2022 03:15:03 -0700 (PDT) From: Efraim Flashner Date: Sun, 23 Oct 2022 13:04:37 +0300 Message-Id: <8714499f8577b76f724e006c5153d20b42855f08.1666519347.git.efraim@flashner.co.il> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: MIME-Version: 1.0 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-swc-1): Move from here ... * gnu/packages/rust-apps.scm (rust-swc-1): ... to here. --- gnu/packages/crates-io.scm | 95 ------------------------------------ gnu/packages/rust-apps.scm | 98 +++++++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 96 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0147a5b986..2b0197f158 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -58692,101 +58692,6 @@ (define-public rust-swayipc-command-builder-0.1 executed by swayipc.") (license license:expat))) -(define-public rust-swc-1 - (package - (name "rust-swc") - (version "1.2.24") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/swc-project/swc") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-base64" ,rust-base64-0.12) - ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) - ("rust-crc" ,rust-crc-1) - ("rust-darling" ,rust-darling-0.10) - ("rust-dashmap" ,rust-dashmap-3) - ("rust-either" ,rust-either-1) - ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-is-macro" ,rust-is-macro-0.1) - ("rust-jemallocator" ,rust-jemallocator-0.3) - ("rust-log" ,rust-log-0.4) - ("rust-mimalloc" ,rust-mimalloc-0.1) - ("rust-napi" ,rust-napi-0.5) - ("rust-napi-build" ,rust-napi-build-0.2) - ("rust-napi-derive" ,rust-napi-derive-0.5) - ("rust-nom" ,rust-nom-5) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-parking-lot" ,rust-parking-lot-0.7) - ("rust-path-clean" ,rust-path-clean-0.1) - ("rust-petgraph" ,rust-petgraph-0.5) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-radix-fmt" ,rust-radix-fmt-1) - ("rust-regex" ,rust-regex-1) - ("rust-relative-path" ,rust-relative-path-1) - ("rust-retain-mut" ,rust-retain-mut-0.1) - ("rust-scoped-tls" ,rust-scoped-tls-1) - ("rust-st-map" ,rust-st-map-0.1) - ("rust-string-cache" ,rust-string-cache-0.8) - ("rust-walkdir" ,rust-walkdir-2) - ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) - #:cargo-development-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-env-logger" ,rust-env-logger-0.7) - ("rust-num-bigint" ,rust-num-bigint-0.2) - ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-sourcemap" ,rust-sourcemap-6) - ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) - ("rust-tempfile" ,rust-tempfile-3)) - #:tests? #f ;; tests env_query_chrome_71 and project_env fail - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'enable-unstable-features - (lambda _ - (setenv "RUSTC_BOOTSTRAP" "1") - (substitute* "ecmascript/jsdoc/src/lib.rs" - (("pub use self" all) - (string-append "#![feature(non_exhaustive)]\n" all))) - (substitute* "ecmascript/parser/src/lib.rs" - (("//! es2019" all) - (string-append "#![feature(non_exhaustive)] -#![feature(mem_take)] -#![feature(proc_macro_hygiene)] -" all))) - (substitute* "ecmascript/transforms/src/lib.rs" - (("#!\\[cfg_attr" all) - (string-append "#![feature(mem_take)]\n" all))) - #t)) - (add-after 'enable-unstable-features 'patch-build-failures - (lambda _ - (chmod ".cargo/config" 420) - (substitute* "ecmascript/transforms/macros/src/lib.rs" - (("use proc_macro::") - "extern crate proc_macro;\nuse proc_macro::")) - (substitute* "common/src/errors/emitter.rs" - ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) - #t))))) - (home-page "https://swc.rs/") - (synopsis "Typescript/javascript compiler") - (description "@code{rust-swc} is a typescript/javascript compiler. It -consumes a javascript or typescript file which uses recently added features -like async-await and emits javascript code which can be executed on old -browsers.") - (license (list license:expat - license:asl2.0)))) - (define-public rust-syn-1 (package (name "rust-syn") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 76a95f01a3..85fc9e8192 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Mark H Weaver ;;; Copyright © 2020 Gabriel Arazas ;;; Copyright © 2020-2022 Nicolas Goaziou +;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> @@ -788,7 +789,102 @@ (define-public rot8 associated input devices using the built-in accelerometer; handy for convertible touchscreen devices.") (license license:expat))) - + +(define-public rust-swc-1 + (package + (name "rust-swc") + (version "1.2.24") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/swc-project/swc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w9al035x0gmard80vqvah8sy8szs6bnd1ynnyssiiylzg7vhyyv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-base64" ,rust-base64-0.12) + ("rust-console-error-panic-hook" ,rust-console-error-panic-hook-0.1) + ("rust-crc" ,rust-crc-1) + ("rust-darling" ,rust-darling-0.10) + ("rust-dashmap" ,rust-dashmap-3) + ("rust-either" ,rust-either-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-is-macro" ,rust-is-macro-0.1) + ("rust-jemallocator" ,rust-jemallocator-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mimalloc" ,rust-mimalloc-0.1) + ("rust-napi" ,rust-napi-0.5) + ("rust-napi-build" ,rust-napi-build-0.2) + ("rust-napi-derive" ,rust-napi-derive-0.5) + ("rust-nom" ,rust-nom-5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.7) + ("rust-path-clean" ,rust-path-clean-0.1) + ("rust-petgraph" ,rust-petgraph-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-radix-fmt" ,rust-radix-fmt-1) + ("rust-regex" ,rust-regex-1) + ("rust-relative-path" ,rust-relative-path-1) + ("rust-retain-mut" ,rust-retain-mut-0.1) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-st-map" ,rust-st-map-0.1) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-env-logger" ,rust-env-logger-0.7) + ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sourcemap" ,rust-sourcemap-6) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-tempfile" ,rust-tempfile-3)) + #:tests? #f ;; tests env_query_chrome_71 and project_env fail + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1") + (substitute* "ecmascript/jsdoc/src/lib.rs" + (("pub use self" all) + (string-append "#![feature(non_exhaustive)]\n" all))) + (substitute* "ecmascript/parser/src/lib.rs" + (("//! es2019" all) + (string-append "#![feature(non_exhaustive)] +#![feature(mem_take)] +#![feature(proc_macro_hygiene)] +" all))) + (substitute* "ecmascript/transforms/src/lib.rs" + (("#!\\[cfg_attr" all) + (string-append "#![feature(mem_take)]\n" all))) + #t)) + (add-after 'enable-unstable-features 'patch-build-failures + (lambda _ + (chmod ".cargo/config" 420) + (substitute* "ecmascript/transforms/macros/src/lib.rs" + (("use proc_macro::") + "extern crate proc_macro;\nuse proc_macro::")) + (substitute* "common/src/errors/emitter.rs" + ((" #\\[cfg\\(feature = \"tty-emitter\"\\)\\]\n") "")) + #t))))) + (home-page "https://swc.rs/") + (synopsis "Typescript/javascript compiler") + (description "@code{rust-swc} is a typescript/javascript compiler. It +consumes a javascript or typescript file which uses recently added features +like async-await and emits javascript code which can be executed on old +browsers.") + (license (list license:expat + license:asl2.0)))) + (define-public git-interactive-rebase-tool (package (name "git-interactive-rebase-tool")