pyrox.dev
garage: update time to fix build with rust 1.80
+8
-5
pkgs/tools/filesystems/garage/default.nix
+8
-5
pkgs/tools/filesystems/garage/default.nix
···
11
11
, nixosTests
12
12
}:
13
13
let
14
-
generic = { version, sha256, cargoHash, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
14
+
generic = { version, sha256, cargoHash, cargoPatches ? [], eol ? false, broken ? false }: rustPlatform.buildRustPackage {
15
15
pname = "garage";
16
16
inherit version;
17
17
···
29
29
rm .cargo/config.toml || true
30
30
'';
31
31
32
-
inherit cargoHash;
32
+
inherit cargoHash cargoPatches;
33
33
34
34
nativeBuildInputs = [ protobuf pkg-config ];
35
35
···
97
97
garage_0_8_7 = generic {
98
98
version = "0.8.7";
99
99
sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
100
-
cargoHash = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
100
+
cargoHash = "sha256-1cGlJP/RRgxt3GGMN1c+7Y5lLHJyvHEnpLsR35R5FfI=";
101
+
cargoPatches = [ ./update-time-0.8.patch ];
101
102
broken = stdenv.isDarwin;
102
103
};
103
104
···
106
107
garage_0_9_4 = generic {
107
108
version = "0.9.4";
108
109
sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
109
-
cargoHash = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
110
+
cargoHash = "sha256-1Hrip4R5dr31czOcFMGW4ZvVfVwvdd7LkwukwNpS3o4=";
111
+
cargoPatches = [ ./update-time.patch ];
110
112
broken = stdenv.isDarwin;
111
113
};
112
114
113
115
garage_1_0_0 = generic {
114
116
version = "1.0.0";
115
117
sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8=";
116
-
cargoHash = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
118
+
cargoHash = "sha256-zol9P01bwlvl1Wap4EekgVpC45izNCt2uKs7x+EEA/E=";
119
+
cargoPatches = [ ./update-time.patch ];
117
120
broken = stdenv.isDarwin;
118
121
};
119
122
+111
pkgs/tools/filesystems/garage/update-time-0.8.patch
+111
pkgs/tools/filesystems/garage/update-time-0.8.patch
···
1
+
diff --git a/Cargo.lock b/Cargo.lock
2
+
index 23604c99e5..58355d867e 100644
3
+
--- a/Cargo.lock
4
+
+++ b/Cargo.lock
5
+
@@ -223,7 +223,7 @@
6
+
"http",
7
+
"hyper",
8
+
"ring",
9
+
- "time 0.3.28",
10
+
+ "time 0.3.36",
11
+
"tokio",
12
+
"tower",
13
+
"tracing",
14
+
@@ -393,7 +393,7 @@
15
+
"percent-encoding",
16
+
"regex",
17
+
"sha2",
18
+
- "time 0.3.28",
19
+
+ "time 0.3.36",
20
+
"tracing",
21
+
]
22
+
23
+
@@ -533,7 +533,7 @@
24
+
"itoa",
25
+
"num-integer",
26
+
"ryu",
27
+
- "time 0.3.28",
28
+
+ "time 0.3.36",
29
+
]
30
+
31
+
[[package]]
32
+
@@ -932,9 +932,12 @@
33
+
34
+
[[package]]
35
+
name = "deranged"
36
+
-version = "0.3.8"
37
+
+version = "0.3.11"
38
+
source = "registry+https://github.com/rust-lang/crates.io-index"
39
+
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
40
+
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
41
+
+dependencies = [
42
+
+ "powerfmt",
43
+
+]
44
+
45
+
[[package]]
46
+
name = "derivative"
47
+
@@ -2410,6 +2413,12 @@
48
+
]
49
+
50
+
[[package]]
51
+
+name = "num-conv"
52
+
+version = "0.1.0"
53
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
54
+
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
55
+
+
56
+
+[[package]]
57
+
name = "num-integer"
58
+
version = "0.1.45"
59
+
source = "registry+https://github.com/rust-lang/crates.io-index"
60
+
@@ -2747,6 +2756,12 @@
61
+
]
62
+
63
+
[[package]]
64
+
+name = "powerfmt"
65
+
+version = "0.2.0"
66
+
+source = "registry+https://github.com/rust-lang/crates.io-index"
67
+
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
68
+
+
69
+
+[[package]]
70
+
name = "ppv-lite86"
71
+
version = "0.2.17"
72
+
source = "registry+https://github.com/rust-lang/crates.io-index"
73
+
@@ -3666,11 +3681,13 @@
74
+
75
+
[[package]]
76
+
name = "time"
77
+
-version = "0.3.28"
78
+
+version = "0.3.36"
79
+
source = "registry+https://github.com/rust-lang/crates.io-index"
80
+
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
81
+
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
82
+
dependencies = [
83
+
"deranged",
84
+
+ "num-conv",
85
+
+ "powerfmt",
86
+
"serde",
87
+
"time-core",
88
+
"time-macros",
89
+
@@ -3678,16 +3695,17 @@
90
+
91
+
[[package]]
92
+
name = "time-core"
93
+
-version = "0.1.1"
94
+
+version = "0.1.2"
95
+
source = "registry+https://github.com/rust-lang/crates.io-index"
96
+
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
97
+
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
98
+
99
+
[[package]]
100
+
name = "time-macros"
101
+
-version = "0.2.14"
102
+
+version = "0.2.18"
103
+
source = "registry+https://github.com/rust-lang/crates.io-index"
104
+
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
105
+
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
106
+
dependencies = [
107
+
+ "num-conv",
108
+
"time-core",
109
+
]
110
+
111
+
+28
pkgs/tools/filesystems/garage/update-time.patch
+28
pkgs/tools/filesystems/garage/update-time.patch
···
1
+
diff --git a/Cargo.lock b/Cargo.lock
2
+
index 9cb4b57ee5..b23da31151 100644
3
+
--- a/Cargo.lock
4
+
+++ b/Cargo.lock
5
+
@@ -4082,9 +4082,9 @@
6
+
7
+
[[package]]
8
+
name = "time"
9
+
-version = "0.3.34"
10
+
+version = "0.3.36"
11
+
source = "registry+https://github.com/rust-lang/crates.io-index"
12
+
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
13
+
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
14
+
dependencies = [
15
+
"deranged",
16
+
"num-conv",
17
+
@@ -4102,9 +4102,9 @@
18
+
19
+
[[package]]
20
+
name = "time-macros"
21
+
-version = "0.2.17"
22
+
+version = "0.2.18"
23
+
source = "registry+https://github.com/rust-lang/crates.io-index"
24
+
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
25
+
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
26
+
dependencies = [
27
+
"num-conv",
28
+
"time-core",