John Soo wrote 5 years ago
(address . guix-patches@gnu.org)
877dv0518q.fsf@asu.edu
Hi Guix,
I found out that rust-parking-lot-0.10 will not compile any longer, so I
upgraded it and made several of its dependencies build properly in the
process.
Thanks!
John
From 14cd7adf79351558674b79aad913432c077c3e43 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 06:30:14 -0700
Subject: [PATCH 01/10] gnu: rust-lock-api-0.3: Update to 0.3.4.
* gnu/packages/crates-io.scm (rust-lock-api-0.3): Update to 0.3.4.
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 58329d2396..ddefe26b89 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -14680,7 +14680,7 @@ by inspecting the system for user preference.")
(define-public rust-lock-api-0.3
(package
(name "rust-lock-api")
- (version "0.3.3")
+ (version "0.3.4")
(source
(origin
(method url-fetch)
@@ -14689,7 +14689,7 @@ by inspecting the system for user preference.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0yzlz7f5xl5sm129dq8jqsrcrkyv7jjnqwd4zr4ijsdlxjaxxckr"))))
+ "0xgc5dzmajh0akbh5d6d7rj9mh5rzpk74pyrc946v2ixgakj9nn4"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
--
2.27.0
From 8ba0fcf5bc45e33f52a4f25970fc39ab2bfe2341 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:41:55 -0700
Subject: [PATCH 02/10] gnu: Add rust-itertools-0.5.
* gnu/packages/crates-io.scm (rust-itertools-0.5): New variable.
---
gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
Toggle diff (34 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ddefe26b89..de1c93e8cd 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -12970,6 +12970,27 @@ windows with this crate.")
(("rust-permutohedron" ,rust-permutohedron-0.2)
("rust-quickcheck" ,rust-quickcheck-0.5))))))
+(define-public rust-itertools-0.5
+ (package
+ (inherit rust-itertools-0.7)
+ (name "rust-itertools")
+ (version "0.5.10")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "itertools" version))
+ (file-name (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1z4lyrakgynvhylya72qb3vizmxmd62whjmg4r8k01d4inbxccs8"))))
+ (arguments
+ `(#:tests? #f ; Tests fail to compile
+ #:cargo-inputs
+ (("rust-either" ,rust-either-1.5))
+ #:cargo-development-inputs
+ (("rust-permutohedron" ,rust-permutohedron-0.2)
+ ("rust-quickcheck" ,rust-quickcheck-0.4))))))
+
(define-public rust-itertools-num-0.1
(package
(name "rust-itertools-num")
--
2.27.0
From f4234d8fb64cbdcb496f98b9046cb93d2fbb626a Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:22:30 -0700
Subject: [PATCH 03/10] gnu: rust-odds-0.3: Do not skip build.
* gnu/packages/crates-io.scm (rust-odds-0.3): Do not skip build.
---
gnu/packages/crates-io.scm | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Toggle diff (27 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index de1c93e8cd..b6d280adcc 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -17718,16 +17718,15 @@ formats.")
"0rdnxa0na4897yb0svb3figz35g4imxjv61yfm2j21gbh5q8v8d9"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-rawpointer" ,rust-rawpointer-0.1)
("rust-rawslice" ,rust-rawslice-0.1)
("rust-unchecked-index" ,rust-unchecked-index-0.2))
#:cargo-development-inputs
- (("rust-itertools" ,rust-itertools-0.8)
- ("rust-lazy-static" ,rust-lazy-static-1)
+ (("rust-itertools" ,rust-itertools-0.7)
+ ("rust-lazy-static" ,rust-lazy-static-0.2)
("rust-memchr" ,rust-memchr-2)
- ("rust-quickcheck" ,rust-quickcheck-0.8))))
+ ("rust-quickcheck" ,rust-quickcheck-0.4))))
(home-page "https://github.com/bluss/odds")
(synopsis "Extra functionality for slices, strings and other things")
(description
--
2.27.0
From d9b4ca71ff1bc8a4addd1c368b03e9d66ea0fc79 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 06:43:01 -0700
Subject: [PATCH 04/10] gnu: Add rust-odds-0.2.
* gnu/packages/crates-io.scm (rust-odds-0.2): New variable.
---
gnu/packages/crates-io.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
Toggle diff (45 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index b6d280adcc..8fc492a458 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -26,10 +26,12 @@
(define-module (gnu packages crates-io)
#:use-module (guix build-system cargo)
+ #:use-module (guix build utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages compression)
@@ -17735,6 +17737,25 @@ slices (@code{.find()}, @code{RevSlice}), strings and other things.
Things in odds may move to more appropriate crates if we find them.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-odds-0.2
+ (package
+ (inherit rust-odds-0.3)
+ (name "rust-odds")
+ (version "0.2.26")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "odds" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "08pvngx0nf7yl9cgk4bahn1a0s8na5g9knbhq7y29kysp58h3bjf"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments rust-odds-0.3)
+ ((#:cargo-inputs inputs)
+ (alist-replace "rust-itertools" rust-itertools-0.5 inputs))))))
+
(define-public rust-onig-5.0
(package
(name "rust-onig")
--
2.27.0
From e93cb26fb18b233f05a637d1f9cdc83cf758ac4b Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 06:57:49 -0700
Subject: [PATCH 05/10] gnu: rust-petgraph-0.4: Do not skip build.
* gnu/packages/crates-io.scm (rust-petgraph-0.4): [arguments] Correct
dependencies, ignore failing test, do not skip build.
---
gnu/packages/crates-io.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
Toggle diff (38 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 8fc492a458..91a6e8a387 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19432,18 +19432,24 @@ algorithm.")
"0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw"))))
(build-system cargo-build-system)
(arguments
- `(#:skip-build? #t
- #:cargo-inputs
+ `(#:cargo-inputs
(("rust-fixedbitset" ,rust-fixedbitset-0.1)
+ ("rust-odds" ,rust-odds-0.2)
("rust-ordermap" ,rust-ordermap-0.3)
- ("rust-quickcheck" ,rust-quickcheck-0.8)
+ ("rust-quickcheck" ,rust-quickcheck-0.4)
("rust-serde" ,rust-serde-1.0)
("rust-serde-derive" ,rust-serde-derive-1.0))
#:cargo-development-inputs
- (("rust-defmac" ,rust-defmac-0.2)
- ("rust-itertools" ,rust-itertools-0.8)
- ("rust-odds" ,rust-odds-0.3)
- ("rust-rand" ,rust-rand-0.4))))
+ (("rust-defmac" ,rust-defmac-0.1)
+ ("rust-itertools" ,rust-itertools-0.7)
+ ("rust-rand" ,rust-rand-0.4))
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'check 'ignore-failing-test
+ (lambda _
+ (substitute* "tests/graph.rs"
+ (("fn dot\\(\\) \\{" all)
+ (string-append "#[ignore] " all))))))))
(home-page "https://github.com/petgraph/petgraph")
(synopsis "Graph data structure library")
(description
--
2.27.0
From 4dde0532af569185731a9a79507eead3d47754f9 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:03:30 -0700
Subject: [PATCH 06/10] gnu: rust-fixedbitset-0.1: Do not skip build.
* gnu/packages/crates-io.scm (rust-fixedbitset-0.1): [arguments] Do not skip
build.
---
gnu/packages/crates-io.scm | 1 -
1 file changed, 1 deletion(-)
Toggle diff (14 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 91a6e8a387..f3d6eca887 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8170,7 +8170,6 @@ cross platform API.")
(base32
"0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))
(build-system cargo-build-system)
- (arguments '(#:skip-build? #t))
(home-page "https://github.com/petgraph/fixedbitset")
(synopsis "FixedBitSet is a simple bitset collection")
(description "FixedBitSet is a simple bitset collection.")
--
2.27.0
From 5f4d2b481a941ce6992b24fdfe89d6a35005a5fe Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:05:59 -0700
Subject: [PATCH 07/10] gnu: Add rust-fixedbitset-0.2.
* gnu/packages/crates-io.scm (rust-fixedbitset-0.2): New variable.
* gnu/packages/crates-io.scm (rust-fixedbitset-0.1): Inherit from
rust-fixedbitset-0.2.
---
gnu/packages/crates-io.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
Toggle diff (49 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index f3d6eca887..787b99cd64 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -8157,10 +8157,10 @@ cross platform API.")
(license (list license:asl2.0
license:expat))))
-(define-public rust-fixedbitset-0.1
+(define-public rust-fixedbitset-0.2
(package
(name "rust-fixedbitset")
- (version "0.1.9")
+ (version "0.2.0")
(source
(origin
(method url-fetch)
@@ -8168,7 +8168,7 @@ cross platform API.")
(file-name (string-append name "-" version ".crate"))
(sha256
(base32
- "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))
+ "0kg03p777wc0dajd9pvlcnsyrwa8dhqwf0sd9r4dw0p82rs39arp"))))
(build-system cargo-build-system)
(home-page "https://github.com/petgraph/fixedbitset")
(synopsis "FixedBitSet is a simple bitset collection")
@@ -8176,6 +8176,20 @@ cross platform API.")
(license (list license:asl2.0
license:expat))))
+(define-public rust-fixedbitset-0.1
+ (package
+ (inherit rust-fixedbitset-0.2)
+ (name "rust-fixedbitset")
+ (version "0.1.9")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "fixedbitset" version))
+ (file-name (string-append name "-" version ".crate"))
+ (sha256
+ (base32
+ "0czam11mi80dbyhf4rd4lz0ihcf7vkfchrdcrn45wbs0h40dxm46"))))))
+
(define-public rust-flame-0.2
(package
(name "rust-flame")
--
2.27.0
From c3ccef8fcb35b8f08a6a12701dcfe0b977f378d7 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:11:56 -0700
Subject: [PATCH 08/10] gnu: Add rust-petgraph-0.4.
* gnu/packages/crates-io.scm (rust-petgraph-0.5): New variable.
* gnu/packages/crates-io.scm (rust-petgraph-0.4): Inherit from
rust-petgraph-0.5.
---
gnu/packages/crates-io.scm | 43 +++++++++++++++++++++++++++++++-------
1 file changed, 35 insertions(+), 8 deletions(-)
Toggle diff (72 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 787b99cd64..495f9d967a 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -19430,8 +19430,42 @@ algorithm.")
"Pest meta language parser and validator.")
(license (list license:asl2.0 license:expat))))
+(define-public rust-petgraph-0.5
+ (package
+ (name "rust-petgraph")
+ (version "0.5.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (crate-uri "petgraph" version))
+ (file-name
+ (string-append name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1dzxda6z17sfxly11m8ja3iargh73pw0s1sdgjyp0qp5dm51cza6"))))
+ (build-system cargo-build-system)
+ (arguments
+ `(#:cargo-inputs
+ (("rust-fixedbitset" ,rust-fixedbitset-0.2)
+ ("rust-ordermap" ,rust-ordermap-0.3)
+ ("rust-quickcheck" ,rust-quickcheck-0.8)
+ ("rust-serde" ,rust-serde-1.0)
+ ("rust-serde-derive" ,rust-serde-derive-1.0))
+ #:cargo-development-inputs
+ (("rust-defmac" ,rust-defmac-0.1)
+ ("rust-itertools" ,rust-itertools-0.8)
+ ("rust-odds" ,rust-odds-0.2)
+ ("rust-rand" ,rust-rand-0.5))))
+ (home-page "https://github.com/petgraph/petgraph")
+ (synopsis "Graph data structure library")
+ (description
+ "Graph data structure library. Provides graph types and graph
+algorithms.")
+ (license (list license:expat license:asl2.0))))
+
(define-public rust-petgraph-0.4
(package
+ (inherit rust-petgraph-0.5)
(name "rust-petgraph")
(version "0.4.13")
(source
@@ -19443,7 +19477,6 @@ algorithm.")
(sha256
(base32
"0kyfmca854s54jk26g2x1kjb04c3k7cjilaxyr0if8lhxv8mjdlw"))))
- (build-system cargo-build-system)
(arguments
`(#:cargo-inputs
(("rust-fixedbitset" ,rust-fixedbitset-0.1)
@@ -19462,13 +19495,7 @@ algorithm.")
(lambda _
(substitute* "tests/graph.rs"
(("fn dot\\(\\) \\{" all)
- (string-append "#[ignore] " all))))))))
- (home-page "https://github.com/petgraph/petgraph")
- (synopsis "Graph data structure library")
- (description
- "Graph data structure library. Provides graph types and graph
-algorithms.")
- (license (list license:expat license:asl2.0))))
+ (string-append "#[ignore] " all))))))))))
(define-public rust-phf-0.8
(package
--
2.27.0
From 235a573defa79622c7bda1d4c79aeb4645494a6f Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:14:43 -0700
Subject: [PATCH 09/10] gnu: rust-parking-lot-core-0.7: Update to 0.7.2.
* gnu/packages/crates-io.scm (rust-parking-lot-core-0.7): Update to 0.7.2.
---
gnu/packages/crates-io.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Toggle diff (33 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 495f9d967a..7453d304cb 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18838,7 +18838,7 @@ synchronization primitives.")
(define-public rust-parking-lot-core-0.7
(package
(name "rust-parking-lot-core")
- (version "0.7.0")
+ (version "0.7.2")
(source
(origin
(method url-fetch)
@@ -18847,7 +18847,7 @@ synchronization primitives.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1wdbrvh35nn09ga570vl5062dpwfbrwgzyrlhhy78ifzhj2870km"))))
+ "18s0cw5y32447c06fhg2mp3xfng22fn1h9fpx3il98sbimv7r36m"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
@@ -18855,7 +18855,7 @@ synchronization primitives.")
("rust-cfg-if" ,rust-cfg-if-0.1)
("rust-cloudabi" ,rust-cloudabi-0.0)
("rust-libc" ,rust-libc-0.2)
- ("rust-petgraph" ,rust-petgraph-0.4)
+ ("rust-petgraph" ,rust-petgraph-0.5)
("rust-redox-syscall" ,rust-redox-syscall-0.1)
("rust-smallvec" ,rust-smallvec-1)
("rust-thread-id" ,rust-thread-id-3.3)
--
2.27.0
From f8114dbf7266970ca91cee5aae644b16e29c50c3 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 18 Jul 2020 07:16:23 -0700
Subject: [PATCH 10/10] gnu: rust-parking-lot-0.10: Upgrade to 0.10.2.
* gnu/packages/crates-io.scm (rust-parking-lot-core-0.10): Upgrade to 0.10.2.
---
gnu/packages/crates-io.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Toggle diff (24 lines)
diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 7453d304cb..cadf241f64 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -18734,7 +18734,7 @@ deserialization, and interpreter in Rust.")
(define-public rust-parking-lot-0.10
(package
(name "rust-parking-lot")
- (version "0.10.0")
+ (version "0.10.2")
(source
(origin
(method url-fetch)
@@ -18743,7 +18743,7 @@ deserialization, and interpreter in Rust.")
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1z0wgf2sd1266y768kxxs3313zjfzj9r3k7j4arfaz0bmd4qrscj"))))
+ "0pjhcbyk6n0g6jsr6s9nf4x8wribm1b2yf8fgc8drbqa77mh99yk"))))
(build-system cargo-build-system)
(arguments
`(#:cargo-inputs
--
2.27.0