From 6b974845c7460d1f3dc84a633eafa785b5e72b9d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 9 May 2022 15:56:44 +0200 Subject: gnu: rust-instant: Fix dependencies. Fixes a build failure introduced in bec6bf64bcbcf559eb0b91abcb7f3b2488916797. * gnu/packages/crates-io.scm (rust-instant-0.1)[arguments]: Adjust inputs as per "guix import crate rust@0.1.9". --- gnu/packages/crates-io.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 0449e4f3fe..54dfda90fa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -29089,13 +29089,14 @@ (define-public rust-instant-0.1 (arguments `(#:tests? #f ; Issue during the wasm test. #:cargo-inputs - (("rust-js-sys" ,rust-js-sys-0.3) + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-js-sys" ,rust-js-sys-0.3) ("rust-stdweb" ,rust-stdweb-0.4) - ("rust-time" ,rust-time-0.1) + ("rust-time" ,rust-time-0.2) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-web-sys" ,rust-web-sys-0.3)) #:cargo-development-inputs - (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))) + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/sebcrozet/instant") (synopsis "Partial replacement for std::time::Instant that works on WASM too") -- cgit v1.2.3 From 2d8daae3bdc98cfe739a26808b59579ee122ea39 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 May 2022 15:32:42 +0300 Subject: gnu: Add rust-thread-id-4. * gnu/packages/crates-io.scm (rust-thread-id-4): New variable. (rust-thread-id-3): Inherit from rust-thread-id-4. --- gnu/packages/crates-io.scm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 54dfda90fa..c59ddca1c9 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -62368,23 +62368,22 @@ (define-public rust-thiserror-impl-1 @code{thiserror} crate.") (license (list license:expat license:asl2.0)))) -(define-public rust-thread-id-3 +(define-public rust-thread-id-4 (package (name "rust-thread-id") - (version "3.3.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (crate-uri "thread-id" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7")))) + (base32 "0zvikdngp0950hi0jgiipr8l36rskk1wk7pc8cd43xr3g5if1psz")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/ruuda/thread-id") (synopsis "Get a unique ID for the current thread in Rust") @@ -62394,6 +62393,25 @@ (define-public rust-thread-id-3 (license (list license:asl2.0 license:expat)))) +(define-public rust-thread-id-3 + (package + (inherit rust-thread-id-4) + (name "rust-thread-id") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "thread-id" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1h90v19fjz3x9b25ywh68z5yf2zsmm6h5zb4rl302ckbsp4z9yy7")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-thread-id-2 (package (inherit rust-thread-id-3) -- cgit v1.2.3 From 25c66d69b274214ce1d1b9482bef087c39571b62 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 May 2022 15:22:58 +0300 Subject: gnu: rust-parking-lot-core-0.8: Fix dependencies. This is a follow-up to d16298196c23cf4d05c4010af399270a2dbbd831. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.8)[arguments]: In cargo-inputs replace rust-cfg-if-0.1 with 1, rust-redox-syscall-0.1 with 0.2, rust-thread-id-3 with 4. Remove rust-cloudabi-0.1. --- gnu/packages/crates-io.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c59ddca1c9..67bb1fb993 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40651,14 +40651,13 @@ (define-public rust-parking-lot-core-0.8 (arguments `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) - ("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-cloudabi" ,rust-cloudabi-0.1) + ("rust-cfg-if" ,rust-cfg-if-1) ("rust-instant" ,rust-instant-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-petgraph" ,rust-petgraph-0.5) - ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-smallvec" ,rust-smallvec-1) - ("rust-thread-id" ,rust-thread-id-3) + ("rust-thread-id" ,rust-thread-id-4) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") -- cgit v1.2.3 From 000a620d17965cf7b6fd22c2387c5db477f5e8db Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 10 May 2022 15:25:58 +0300 Subject: gnu: rust-parking-lot-0.11: Fix dependencies. This is a follow-up to f02f8db3810b5c304bce98df9be4c809e13861de. * gnu/packages/crates-io.scm (rust-parking-lot-0.11)[arguments]: In cargo-development-inputs replace rust-rand-0.7 with 0.8. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 67bb1fb993..12ba102da5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40523,7 +40523,7 @@ (define-public rust-parking-lot-0.11 ("rust-parking-lot-core" ,rust-parking-lot-core-0.8)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) - ("rust-rand" ,rust-rand-0.7)))) + ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "Efficient implementations of the standard synchronization primitives") -- cgit v1.2.3 From 427afa650170133c4888878f55d245d8047c58e2 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 11 May 2022 00:20:18 +0200 Subject: gnu: rust-parking-lot-core@0.8: Fix compilation. Fixes a build failure introduced in d16298196c23cf4d05c4010af399270a2dbbd831. This is a followup to 25c66d69b274214ce1d1b9482bef087c39571b62. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.8): Add 'relax-dependencies' phase. --- gnu/packages/crates-io.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 12ba102da5..cf8fc9a2ca 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40658,7 +40658,15 @@ (define-public rust-parking-lot-core-0.8 ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-winapi" ,rust-winapi-0.3)) + #:phases (modify-phases %standard-phases + (add-after 'unpack 'relax-dependencies + (lambda _ + ;; XXX: The file demands 0.3.60; we have 0.3.56, but + ;; that works well, really. + (substitute* "Cargo.toml" + (("0\\.3\\.60") + ,(package-version rust-backtrace-0.3)))))))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom -- cgit v1.2.3 From ef1d3d44d0f53917772cdb42f4dc380baec4eb7c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 09:41:56 +0300 Subject: gnu: rust-parking-lot-core-0.8: Move code changes to snippet. This allows the changes to propagate through the cargo-build-system. * gnu/packages/crates-io.scm (rust-parking-lot-core-0.8)[source]: Add snippet to relax version dependencies. [arguments]: Remove 'relax-dependencies phase. --- gnu/packages/crates-io.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index cf8fc9a2ca..2b67033775 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -40646,7 +40646,14 @@ (define-public rust-parking-lot-core-0.8 (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08n7w09q6b2prvazbzgwrc9ml7aaf8yg3132ifsayrkwy1nwwzs6")))) + "08n7w09q6b2prvazbzgwrc9ml7aaf8yg3132ifsayrkwy1nwwzs6")) + (modules '((guix build utils))) + (snippet + '(begin + ;; XXX: The file demands 0.3.60; we have 0.3.56, but + ;; that works well, really. + (substitute* "Cargo.toml" + (("0\\.3\\.60") "0.3.56")))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -40658,15 +40665,7 @@ (define-public rust-parking-lot-core-0.8 ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-winapi" ,rust-winapi-0.3)) - #:phases (modify-phases %standard-phases - (add-after 'unpack 'relax-dependencies - (lambda _ - ;; XXX: The file demands 0.3.60; we have 0.3.56, but - ;; that works well, really. - (substitute* "Cargo.toml" - (("0\\.3\\.60") - ,(package-version rust-backtrace-0.3)))))))) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/Amanieu/parking_lot") (synopsis "API for creating custom synchronization primitives") (description "This package provides an advanced API for creating custom -- cgit v1.2.3 From f0ce201f499b075e1e0248d91c97c30469e84407 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 10:03:36 +0300 Subject: gnu: rust-proc-macro-error-1: Move code changes to snippet. * gnu/packages/crates-io.scm (rust-proc-macro-error-1)[arguments]: Move code relaxing version requirements from custom phase ... [source]: ... to a snippet. --- gnu/packages/crates-io.scm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 2b67033775..84f09f2da7 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -44645,11 +44645,17 @@ (define-public rust-proc-macro-error-1 (uri (crate-uri "proc-macro-error" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1373bhxaf0pagd8zkyd03kkx6bchzf6g0dkwrwzsnal9z47lj9fs")))) + (base32 "1373bhxaf0pagd8zkyd03kkx6bchzf6g0dkwrwzsnal9z47lj9fs")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Ignore the "DO NOT BUMP" warning. + (substitute* "Cargo.toml" + (("=1.0.107") "^1.0.107") + (("=0.5.2") "^0.5.2")))))) (build-system cargo-build-system) (arguments - ;; Tests fail with "extern crate test_crate; <-- can't find crate" error. - `(#:tests? #f + `(#:tests? #f ; 'test_crate' folder not included in release. #:cargo-inputs (("rust-proc-macro-error-attr" ,rust-proc-macro-error-attr-1) ("rust-proc-macro2" ,rust-proc-macro2-1) @@ -44659,14 +44665,7 @@ (define-public rust-proc-macro-error-1 #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1) ("rust-toml" ,rust-toml-0.5) - ("rust-trybuild" ,rust-trybuild-1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-version-requirements - (lambda _ - (substitute* "Cargo.toml" - (("1.0.107") ,(package-version rust-serde-derive-1)) - (("0.5.2") ,(package-version rust-toml-0.5)))))))) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://gitlab.com/CreepySkeleton/proc-macro-error") (synopsis "Drop-in replacement to panics in proc-macros") (description -- cgit v1.2.3 From 210bc02c508f206a743f2d3dc0541fa9cd9d6b69 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 10:45:46 +0300 Subject: gnu: rust-pyo3-0.15: Adjust version dependency relaxing code. * gnu/packages/crates-io.scm (rust-pyo3-0.15)[source]: Adjust snippet to require at least the desired version, not an exact version. --- gnu/packages/crates-io.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 84f09f2da7..9b593c526e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -45753,7 +45753,7 @@ (define-public rust-pyo3-0.15 ;; version of RUST-CRITERION-0.3. '(substitute* "Cargo.toml" (("\"=0\\.3\\.4\"") - "\"=0.3.5\""))))) + "\"^0.3.4\""))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs -- cgit v1.2.3 From 408d78d3ef322bfc274e5d97babf7bcf9baa4966 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 10:53:51 +0300 Subject: gnu: rust-average-0.13: Move code changes to snippet. * gnu/packages/crates-io.scm (rust-average-0.13)[arguments]: Move code relaxing version requirements ... [source]: ... to a snippet. (rust-nalgebra-0.26, rust-nalgebra-macros-0.1, rust-rand-distr-0.4, rust-statrs-0.14)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9b593c526e..c3718bea72 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -5248,20 +5248,18 @@ (define-public rust-average-0.13 (uri (crate-uri "average" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1c97m8yagvq8r6qgd3harm5vnkdbld4mxg9byyxh6igjsf8wfgl4")))) + (base32 "1c97m8yagvq8r6qgd3harm5vnkdbld4mxg9byyxh6igjsf8wfgl4")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + ;; The resolver feature is not supported by our versions of Cargo. + (("resolver = \"2\".*") "") + ;; Relax version requirement for byteorder + (("=1.3") "^1.3")))))) (build-system cargo-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-Cargo.toml - (lambda _ - (substitute* '("guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml" - "Cargo.toml") - ;; The resolver feature is not supported by this version of Cargo. - (("resolver = \"2\".*") "") - ;; Relax! - (("1.3") ,(package-version rust-byteorder-1)))))) - #:cargo-inputs + `(#:cargo-inputs (("rust-easy-cast" ,rust-easy-cast-0.4) ("rust-float-ord" ,rust-float-ord-0.3) ("rust-num-traits" ,rust-num-traits-0.2) @@ -35753,8 +35751,7 @@ (define-public rust-nalgebra-0.26 (add-after 'configure 'patch-Cargo.toml (lambda _ (substitute* '("Cargo.toml" - "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml" - "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") ;; The resolver feature is not supported by this version of Cargo. (("resolver = \"2\".*") ""))))) #:cargo-inputs @@ -35930,8 +35927,7 @@ (define-public rust-nalgebra-macros-0.1 (lambda _ (substitute* '("Cargo.toml" "guix-vendor/rust-nalgebra-macros-0.1.0.tar.gz/Cargo.toml" - "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml" - "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") ;; The resolver feature is not supported by this version of Cargo. (("resolver = \"2\".*") ""))))) #:cargo-inputs @@ -46959,8 +46955,7 @@ (define-public rust-rand-distr-0.4 (modify-phases %standard-phases (add-after 'configure 'patch-Cargo.toml (lambda _ - (substitute* '("Cargo.toml" - "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml") + (substitute* "Cargo.toml" ;; The resolver feature is not supported by this version of Cargo. (("resolver = \"2\".*") ""))))) #:cargo-inputs @@ -58246,7 +58241,6 @@ (define-public rust-statrs-0.14 (add-after 'configure 'patch-Cargo.toml (lambda _ (substitute* '("Cargo.toml" - "guix-vendor/rust-average-0.13.1.tar.gz/Cargo.toml" "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") ;; The resolver feature is not supported by this version of Cargo. (("resolver = \"2\".*") ""))))) -- cgit v1.2.3 From 9dd784bacee8f3d3aed6e25520a4fd049be0597d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 11:13:28 +0300 Subject: gnu: rust-nalgebra-0.26: Move code changes to snippet. * gnu/packages/crates-io.scm (rust-nalgebra-0.26)[arguments]: Move code relaxing version requirements ... [source]: ... to a snippet. (rust-nalgebra-macros-0.1, rust-statrs-0.14)[arguments]: Adjust accordingly. --- gnu/packages/crates-io.scm | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c3718bea72..bfd8e42b7d 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35742,18 +35742,16 @@ (define-public rust-nalgebra-0.26 (uri (crate-uri "nalgebra" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01hxksmgg17c4k2rzjx1h8kkjbw9rm81dsancg459zh2zrcisva7")))) + (base32 "01hxksmgg17c4k2rzjx1h8kkjbw9rm81dsancg459zh2zrcisva7")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + ;; The resolver feature is not supported by our versions of Cargo. + (("resolver = \"2\".*") "")))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-Cargo.toml - (lambda _ - (substitute* '("Cargo.toml" - "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") - ;; The resolver feature is not supported by this version of Cargo. - (("resolver = \"2\".*") ""))))) #:cargo-inputs (("rust-abomonation" ,rust-abomonation-0.7) ("rust-alga" ,rust-alga-0.9) @@ -35926,8 +35924,7 @@ (define-public rust-nalgebra-macros-0.1 (add-after 'configure 'patch-Cargo.toml (lambda _ (substitute* '("Cargo.toml" - "guix-vendor/rust-nalgebra-macros-0.1.0.tar.gz/Cargo.toml" - "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") + "guix-vendor/rust-nalgebra-macros-0.1.0.tar.gz/Cargo.toml") ;; The resolver feature is not supported by this version of Cargo. (("resolver = \"2\".*") ""))))) #:cargo-inputs @@ -58236,14 +58233,6 @@ (define-public rust-statrs-0.14 (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-Cargo.toml - (lambda _ - (substitute* '("Cargo.toml" - "guix-vendor/rust-nalgebra-0.26.2.tar.gz/Cargo.toml") - ;; The resolver feature is not supported by this version of Cargo. - (("resolver = \"2\".*") ""))))) #:cargo-inputs (("rust-approx" ,rust-approx-0.4) ("rust-lazy-static" ,rust-lazy-static-1) -- cgit v1.2.3 From d47b7bbfc818e16ab9899756f3a27f89834d4021 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 11:26:37 +0300 Subject: gnu: rust-nalgebra-macros-0.1: Move code changes to snippet. * gnu/packages/crates-io.scm (rust-nalgebra-macros-0.1)[arguments]: Move code relaxing version requirements ... [source]: ... to a snippet. --- gnu/packages/crates-io.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index bfd8e42b7d..c595e920aa 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35915,18 +35915,16 @@ (define-public rust-nalgebra-macros-0.1 (uri (crate-uri "nalgebra-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "063jvvvlwmzzxfr4wyiil2cn1yqj3arvghwsr2nk4ilv2jwc1z01")))) + (base32 "063jvvvlwmzzxfr4wyiil2cn1yqj3arvghwsr2nk4ilv2jwc1z01")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + ;; The resolver feature is not supported by our versions of Cargo. + (("resolver = \"2\".*") "")))))) (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-Cargo.toml - (lambda _ - (substitute* '("Cargo.toml" - "guix-vendor/rust-nalgebra-macros-0.1.0.tar.gz/Cargo.toml") - ;; The resolver feature is not supported by this version of Cargo. - (("resolver = \"2\".*") ""))))) #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) -- cgit v1.2.3 From 427dbce3a86d2d9d2229e858af24083f912f9fe9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 11 May 2022 11:29:37 +0300 Subject: gnu: rust-rand-distr-0.4: Move code changes to snippet. * gnu/packages/crates-io.scm (rust-rand-distr-0.4)[arguments]: Move code relaxing version requirements ... [source]: ... to a snippet. --- gnu/packages/crates-io.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index c595e920aa..7c55c7593e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -46943,17 +46943,16 @@ (define-public rust-rand-distr-0.4 (uri (crate-uri "rand_distr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0brd2946xfapm2bmhmczfbwck041x7khsfhqxw1f24kxis7m8kcn")))) + (base32 "0brd2946xfapm2bmhmczfbwck041x7khsfhqxw1f24kxis7m8kcn")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + ;; The resolver feature is not supported by our versions of Cargo. + (("resolver = \"2\".*") "")))))) (build-system cargo-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'configure 'patch-Cargo.toml - (lambda _ - (substitute* "Cargo.toml" - ;; The resolver feature is not supported by this version of Cargo. - (("resolver = \"2\".*") ""))))) - #:cargo-inputs + `(#:cargo-inputs (("rust-average" ,rust-average-0.13) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-rand" ,rust-rand-0.8) -- cgit v1.2.3 From e764b89a52171fd5ff6d22fdb562ceb60ec6a50a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 31 Mar 2022 16:34:47 +0000 Subject: gnu: libgit2: Update to 1.4.3. * gnu/packages/version-control.scm (libgit2): Update to 1.4.3. [source]: Adjust snippet to comment out the "10 years ago" test, which was changed in 1.4.3 but is still problematic. [arguments]: Add "-DUSE_SSH=ON". Remove 'fix-hardcoded-paths' phase. Adjust 'check' phase for new executable name. (libgit2-1.3): New variable. (libgit2-1.1): Inherit from 'libgit2-1.3'; inherit from its origin too. * gnu/packages/crates-io.scm (rust-git2-0.13)[inputs]: Use LIBGIT2-1.3. * gnu/packages/python-xyz.scm (python-pygit2)[propagated-inputs]: Likewise. Co-authored-by: Maxime Devos --- gnu/packages/crates-io.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/version-control.scm | 66 ++++++++++++++++++++++++---------------- 3 files changed, 41 insertions(+), 29 deletions(-) (limited to 'gnu/packages/crates-io.scm') diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 7c55c7593e..136e5fe727 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -25048,7 +25048,7 @@ (define-public rust-git2-0.13 `(("pkg-config" ,pkg-config) ("git" ,git-minimal))) ;for a single test (inputs - (list libgit2 libssh2 openssl zlib)) + (list libgit2-1.3 libssh2 openssl zlib)) (home-page "https://github.com/rust-lang/git2-rs") (synopsis "Rust bindings to libgit2") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 659538d193..299804ae3e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6137,7 +6137,7 @@ (define-public python-pygit2 (arguments '(#:tests? #f)) ; tests don't run correctly in our environment (propagated-inputs - (list python-cached-property python-cffi libgit2)) + (list python-cached-property python-cffi libgit2-1.3)) (native-inputs (list python-pytest)) (home-page "https://github.com/libgit2/pygit2") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 49b53789f9..d528a08e63 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -44,6 +44,7 @@ ;;; Copyright © 2021 jgart ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Jai Vetrivelan +;;; Copyright © 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -789,7 +790,7 @@ (define-public git-cal (define-public libgit2 (package (name "libgit2") - (version "1.3.0") + (version "1.4.3") (source (origin ;; Since v1.1.1, release artifacts are no longer offered (see: ;; https://github.com/libgit2/libgit2/discussions/5932#discussioncomment-1682729). @@ -800,18 +801,18 @@ (define-public libgit2 (file-name (git-file-name name version)) (sha256 (base32 - "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")) + "02x1a4zrzpzjd0yxnsi8njh5hgihc1iy1v4r0fnl8m4ckcgp6x2s")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "deps") ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" doesn't match anything, - ;; which is no longer true. Adjust that test. + ;; assumes "HEAD@{10 years ago}" matches a specific commit. + ;; See . (substitute* "tests/refs/revparse.c" - (("10 years ago") - "100 years ago")))))) + (("test_object.*10 years ago.*" all) + (string-append "// " all "\n"))))))) (build-system cmake-build-system) (outputs '("out" "debug")) (arguments @@ -819,6 +820,7 @@ (define-public libgit2 (list "-DUSE_NTLMCLIENT=OFF" ;TODO: package this "-DREGEX_BACKEND=pcre2" "-DUSE_HTTP_PARSER=system" + "-DUSE_SSH=ON" ; cmake fails to find libssh if this is missing ,@(if (%current-target-system) `((string-append "-DPKG_CONFIG_EXECUTABLE=" @@ -829,18 +831,11 @@ (define-public libgit2 '())) #:phases (modify-phases %standard-phases - (add-after 'unpack 'fix-hardcoded-paths - (lambda _ - (substitute* "tests/repo/init.c" - (("#!/bin/sh") (string-append "#!" (which "sh")))) - (substitute* "tests/clar/fs.h" - (("/bin/cp") (which "cp")) - (("/bin/rm") (which "rm"))))) ;; Run checks more verbosely, unless we are cross-compiling. (replace 'check (lambda* (#:key (tests? #t) #:allow-other-keys) (if tests? - (invoke "./libgit2_clar" "-v" "-Q") + (invoke "./libgit2_tests" "-v" "-Q") ;; Tests may be disabled if cross-compiling. (format #t "Test suite not run.~%"))))))) (inputs @@ -859,12 +854,39 @@ (define-public libgit2 ;; GPLv2 with linking exception (license license:gpl2))) -(define-public libgit2-1.1 +(define-public libgit2-1.3 (package (inherit libgit2) - (name "libgit2") + (version "1.3.0") + (source (origin + (inherit (package-source libgit2)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libgit2/libgit2") + (commit (string-append "v" version)))) + (file-name (git-file-name "libgit2" version)) + (sha256 + (base32 + "0vgpb2175a5dhqiy1iwywwppahgqhi340i8bsvafjpvkw284vazd")))) + (arguments + (substitute-keyword-arguments (package-arguments libgit2) + ((#:phases _ '%standard-phases) + `(modify-phases %standard-phases + ;; Run checks more verbosely, unless we are cross-compiling. + (replace 'check + (lambda* (#:key (tests? #t) #:allow-other-keys) + (if tests? + (invoke "./libgit2_clar" "-v" "-Q") + ;; Tests may be disabled if cross-compiling. + (format #t "Test suite not run.~%")))))))))) + +(define-public libgit2-1.1 + (package + (inherit libgit2-1.3) (version "1.1.0") (source (origin + (inherit (package-source libgit2-1.3)) + (file-name #f) ;use the default name (method url-fetch) (uri (string-append "https://github.com/libgit2/libgit2/" "releases/download/v" version @@ -872,17 +894,7 @@ (define-public libgit2-1.1 (sha256 (base32 "1fjdglkh04qv3b4alg621pxa689i0wlf8m7nf2755zawjr2zhwxd")) - (patches (search-patches "libgit2-mtime-0.patch")) - (snippet '(begin - (delete-file-recursively "deps") - - ;; The "refs:revparse::date" test is time-dependent: it - ;; assumes "HEAD@{10 years ago}" doesn't match anything, - ;; which is no longer true. Adjust that test. - (substitute* "tests/refs/revparse.c" - (("10 years ago") - "100 years ago")))) - (modules '((guix build utils))))))) + (patches (search-patches "libgit2-mtime-0.patch")))))) (define-public git-crypt (package -- cgit v1.2.3