commit 2f148bcb6ea73c4a80f4bf4c545b831a24c98548
Author: Jan Palus <at...@pld-linux.org>
Date: Tue Jan 4 00:22:02 2022 +0100
update nix crate to 0.20.* in attempt to fix x32 build
greetd.spec | 4 +++-
nix0.20.patch | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 73 insertions(+), 1 deletion(-)
---
diff --git a/greetd.spec b/greetd.spec
index f18d068..50b039e 100644
--- a/greetd.spec
+++ b/greetd.spec
@@ -9,8 +9,9 @@ Group: Applications
Source0:
https://git.sr.ht/~kennylevinsen/greetd/archive/%{version}.tar.gz
# Source0-md5: 6c15717ca4741f5c99bba7c16846481f
Source1: %{name}-crates-%{crates_ver}.tar.xz
-# Source1-md5: f0f984d1ce6075538aaa10025a1b9181
+# Source1-md5: 0bbfc01afb256f884be0759b58858de0
Source2: %{name}.pamd
+Patch0: nix0.20.patch
URL: https://git.sr.ht/~kennylevinsen/greetd
BuildRequires: cargo
BuildRequires: pam-devel
@@ -42,6 +43,7 @@ Simple, text-based greeter for greetd.
%prep
%setup -q -a1
+%patch0 -p1
%{__mv} %{name}-%{crates_ver}/* .
sed -i -e 's/@@VERSION@@/%{version}/' Cargo.lock
diff --git a/nix0.20.patch b/nix0.20.patch
new file mode 100644
index 0000000..52554db
--- /dev/null
+++ b/nix0.20.patch
@@ -0,0 +1,70 @@
+diff --color -ur greetd-0.8.0.orig/agreety/Cargo.toml
greetd-0.8.0/agreety/Cargo.toml
+--- greetd-0.8.0.orig/agreety/Cargo.toml 2021-09-05 21:15:06.000000000
+0200
++++ greetd-0.8.0/agreety/Cargo.toml 2022-01-04 00:13:21.192784742 +0100
+@@ -13,4 +13,4 @@
+ rpassword = "5.0"
+ getopts = "0.2"
+ enquote = "1.0.3"
+-nix = "0.19"
++nix = "0.20"
+diff --color -ur greetd-0.8.0.orig/Cargo.lock greetd-0.8.0/Cargo.lock
+--- greetd-0.8.0.orig/Cargo.lock 2021-09-05 21:15:06.000000000 +0200
++++ greetd-0.8.0/Cargo.lock 2022-01-04 00:13:39.762707238 +0100
+@@ -134,9 +134,9 @@
+
+ [[package]]
+ name = "libc"
+-version = "0.2.82"
++version = "0.2.112"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
++checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+
+ [[package]]
+ name = "log"
+@@ -154,6 +154,15 @@
+ checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
+
+ [[package]]
++name = "memoffset"
++version = "0.6.5"
++source = "registry+https://github.com/rust-lang/crates.io-index";
++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
++dependencies = [
++ "autocfg",
++]
++
++[[package]]
+ name = "mio"
+ version = "0.7.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+@@ -178,14 +187,15 @@
+
+ [[package]]
+ name = "nix"
+-version = "0.19.1"
++version = "0.20.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
+-checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
++checksum = "f5e06129fb611568ef4e868c14b326274959aa70ff7776e9d55323531c374945"
+ dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
++ "memoffset",
+ ]
+
+ [[package]]
+diff --color -ur greetd-0.8.0.orig/greetd/Cargo.toml
greetd-0.8.0/greetd/Cargo.toml
+--- greetd-0.8.0.orig/greetd/Cargo.toml 2021-09-05 21:15:06.000000000
+0200
++++ greetd-0.8.0/greetd/Cargo.toml 2022-01-04 00:13:28.676081536 +0100
+@@ -11,7 +11,7 @@
+ debug = []
+
+ [dependencies]
+-nix = "0.19"
++nix = "0.20"
+ pam-sys = "0.5.6"
+ users = "0.11.0"
+ serde = { version = "1.0", features = ["derive"] }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/greetd.git/commitdiff/2f148bcb6ea73c4a80f4bf4c545b831a24c98548
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
