Attachment 16937 Details for Bug 51325 – nix 0.23 & nix 0.26 patch for cosmic-session

[patch] nix 0.23 & nix 0.26 patch for cosmic-session

session.patch (text/plain), 3.35 KB, created by Ilya Sorochan on 2024-10-01 10:52:16 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Ilya Sorochan

Created: 2024-10-01 10:52:16 MSK

Size: 3.35 KB

patch

obsolete

>diff --git a/.gear/rules b/.gear/rules
>index 29887f5..27a6803 100644
>--- a/.gear/rules
>+++ b/.gear/rules
>@@ -1,2 +1,3 @@
> tar: cosmic-session-1.0.0.alpha.2-cargo name=cosmic-session-1.0.0.alpha.2-cargo base=
> tar: cosmic-session name=cosmic-session-1.0.0.alpha.2
>+copy: *.patch
>diff --git a/cosmic-session-1.0.0-alt-0.23-nix-loongarch64.patch b/cosmic-session-1.0.0-alt-0.23-nix-loongarch64.patch
>new file mode 100644
>index 0000000..da07099
>--- /dev/null
>+++ b/cosmic-session-1.0.0-alt-0.23-nix-loongarch64.patch
>@@ -0,0 +1,14 @@
>+Bring support of loongarch64 to nix 0.23
>+
>+diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
>+index 68ebaba..d9a41f9 100644
>+--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
>++++ b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.23.2/src/sys/ioctl/linux.rs
>+@@ -34,6 +34,7 @@ mod consts {
>+           target_arch = "s390x",
>+           target_arch = "x86_64",
>+           target_arch = "aarch64",
>++          target_arch = "loongarch64",
>+           target_arch = "riscv64"))]
>+ mod consts {
>+     #[doc(hidden)]
>diff --git a/cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch b/cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch
>new file mode 100644
>index 0000000..71eae88
>--- /dev/null
>+++ b/cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch
>@@ -0,0 +1,15 @@
>+Bring support of loongarch64 to nix 0.26
>+
>+diff --git a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs b/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
>+--- a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
>++++ a/cosmic-session-1.0.0.alpha.2-cargo/vendor/nix-0.26.2/src/sys/ioctl/linux.rs
>+@@ -42,7 +42,8 @@ mod consts {
>+     target_arch = "x86_64",
>+     target_arch = "aarch64",
>+     target_arch = "riscv32",
>+-    target_arch = "riscv64"
>++    target_arch = "riscv64",
>++    target_arch = "loongarch64"
>+ ))]
>+ mod consts {
>+     #[doc(hidden)]
>diff --git a/cosmic-session.spec b/cosmic-session.spec
>index fe5a043..4204879 100644
>--- a/cosmic-session.spec
>+++ b/cosmic-session.spec
>@@ -8,7 +8,7 @@
> 
> Name: cosmic-session
> Version: %ver_major.0
>-Release: alt0.2%beta
>+Release: alt0.0.port.2%beta
> 
> Summary: COSMIC Session Manager
> License: GPL-3.0
>@@ -24,6 +24,9 @@ Source: %name-%version%beta.tar
> %endif
> Source1: %name-%version%beta-cargo.tar
> 
>+Patch: cosmic-session-1.0.0-alt-0.23-nix-loongarch64.patch
>+Patch1: cosmic-session-1.0.0-alt-0.26-nix-loongarch64.patch
>+
> ExcludeArch: %ix86 armh ppc64le
> 
> Requires: cosmic-app-library
>@@ -63,6 +66,11 @@ Session manager for the COSMIC desktop environment.
> cargo vendor | sed 's/^directory = ".*"/directory = "vendor"/g' > .cargo/config.toml
> tar -cf %_sourcedir/%name-%version%beta-cargo.tar .cargo/ vendor/}
> 
>+%patch -p2
>+%patch1 -p2
>+sed -i -e 's/"files":{[^}]*}/"files":{}/' \
>+     ./vendor/nix-*/.cargo-checksum.json
>+
> # fix path
> sed -i 's|\/usr\(\/bin\/dbus-run-session\)|\1|' data/start-cosmic
> 
>@@ -83,6 +91,9 @@ just rootdir=%buildroot install
> %_datadir/wayland-sessions/cosmic.desktop
> 
> %changelog
>+* Fri Sep 27 2024 Ilya Sorochan <k0tran@altlinux.org> 1.0.0-alt0.0.port.2.alpha.2
>+- add two patches for old nix crate versions
>+
> * Thu Sep 26 2024 Yuri N. Sedunov <aris@altlinux.org> 1.0.0-alt0.2.alpha.2
> - 1.0.0-alpha.2
>

Actions: View | Diff

Attachments on bug 51325: 16734 | 16735 | 16736 | 16737 | 16738 | 16739 | 16740 | 16741 | 16742 | 16743 | 16744 | 16745 | 16746 | 16747 | 16748 | 16749 | 16750 | 16751 | 16752 | 16934 | 16935 | 16936 | 16937 | 16938 | 16939 | 16940 | 17405 | 17406 | 17407 | 17408 | 17409