Codebase list rust-libslirp / a500ecc
libmount - fix to build with nix 0.26 Peter Michael Green 1 year, 4 months ago
5 changed file(s) with 41 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
+10
-0
src/libmount/debian/changelog less more
0 rust-libmount (0.1.15-6) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
1
2 * Team upload.
3 * Package libmount 0.1.15 from crates.io using debcargo 2.6.0
4 * Relax nix dependency to ">= 0.22, < 1.0"
5 * Eliminate use of use of function as_errno which was deprecated in nix
6 0.22 and removed in nix 0.26.
7
8 -- Peter Michael Green <plugwash@debian.org> Sat, 10 Dec 2022 11:36:43 +0000
9
010 rust-libmount (0.1.15-5) unstable; urgency=medium
111
212 * Team upload.
+1
-1
src/libmount/debian/copyright.debcargo.hint less more
1010 be correct information so you should review and fix this before uploading to
1111 the archive.
1212
13 Files: ./LICENSE-MIT
13 Files: LICENSE-MIT
1414 Copyright: 2016 The libmount Developers
1515 License: UNKNOWN-LICENSE; FIXME (overlay)
1616 Comment:
+29
-0
src/libmount/debian/patches/nix.diff less more
0 nix 0.22 deprecated as_errno and made it into a no-op
1 nix 0.26 removed it.
2
3 Index: libmount/Cargo.toml
4 ===================================================================
5 --- libmount.orig/Cargo.toml
6 +++ libmount/Cargo.toml
7 @@ -28,7 +28,7 @@ path = "src/lib.rs"
8 version = "0.2.28"
9
10 [dependencies.nix]
11 -version = "0.14"
12 +version = ">= 0.22, < 1.0"
13
14 [dependencies.quick-error]
15 version = "2.0"
16 Index: libmount/src/lib.rs
17 ===================================================================
18 --- libmount.orig/src/lib.rs
19 +++ libmount/src/lib.rs
20 @@ -85,7 +85,7 @@ impl OSError {
21 fn from_nix(err: nix::Error, explain: Box<Explainable>) -> OSError {
22 OSError(
23 MountError::Io(
24 - err.as_errno().map_or_else(|| io::Error::new(io::ErrorKind::Other, err), io::Error::from),
25 + io::Error::from(err),
26 ),
27 explain,
28 )
+0
-9
src/libmount/debian/patches/relax-deps.diff less more
11 ===================================================================
22 --- libmount.orig/Cargo.toml
33 +++ libmount/Cargo.toml
4 @@ -28,7 +28,7 @@ path = "src/lib.rs"
5 version = "0.2.28"
6
7 [dependencies.nix]
8 -version = "0.14"
9 +version = ">= 0.23, < 0.26"
10
11 [dependencies.quick-error]
12 version = "1.2.0"
134 @@ -36,7 +36,7 @@ version = "1.2.0"
145 version = "0.2.1"
156
+1
-0
src/libmount/debian/patches/series less more
00 relax-deps.diff
11 quick-error-2.patch
22 tolerate-no-root-mount.diff
3 nix.diff