[PR PATCH] niri: update to 25.01

[PR PATCH] niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 1400 bytes --]

There is a new pull request by trolljoe against master on the void-packages repository

https://github.com/trolljoe/void-packages niri
https://github.com/void-linux/void-packages/pull/53946

niri: update to 25.01
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

this goes by the new packaging niri page (https://github.com/YaLTeR/niri/wiki/Packaging-niri), if setting XDG_RUNTIME_DIR to `mktemp` isn't enough i'll skip the tests.

A patch file from https://github.com/void-linux/void-packages/pull/53946.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-niri-53946.patch --]
[-- Type: text/x-diff, Size: 1162 bytes --]

From 1eb21be3e4bae601fc0087a4d22b92012e1bac71 Mon Sep 17 00:00:00 2001
From: Joetroll <joetroll@proton.me>
Date: Sun, 12 Jan 2025 15:23:37 -0300
Subject: [PATCH] niri: update to 25.01

---
 srcpkgs/niri/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/niri/template b/srcpkgs/niri/template
index 0fb83c6b62dbec..26a83b97cf5d90 100644
--- a/srcpkgs/niri/template
+++ b/srcpkgs/niri/template
@@ -1,6 +1,6 @@
 # Template file for 'niri'
 pkgname=niri
-version=0.1.10.1
+version=25.01
 revision=1
 build_style=cargo
 configure_args="--no-default-features --features xdp-gnome-screencast"
@@ -13,7 +13,10 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/YaLTeR/niri"
 changelog="https://github.com/YaLTeR/niri/releases"
 distfiles="https://github.com/YaLTeR/niri/archive/refs/tags/v${version}.tar.gz"
-checksum=d8854830436a87215b0bc6a60b6d43f350d927a03a2798c75f0fbda228bac8d3
+checksum=86b89bcfc3fc6a8ed81f9e3f0ac7a29bd30267515efb2c19e1e0bc2ccd67b649
+
+export NIRI_BUILD_COMMIT="e35c630"
+export XDG_RUNTIME_DIR="$(mktemp -d)"
 
 post_install() {
 	vinstall resources/niri.desktop 644 usr/share/wayland-sessions

Re: niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New comment by trolljoe on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2585909075

Comment:
tested and it seems to work fine.

Re: niri: update to 25.01

[lukeflo]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New comment by lukeflo on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2586779337

Comment:
> tested and it seems to work fine.

Can confirm that it works just fine!

Re: niri: update to 25.01

[oliver-cfc]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by oliver-cfc on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588467884

Comment:
Another confirmation that all is good... on a musl installation here.

Re: niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

New comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588543127

Comment:
Works fine for me!
Might I ask, however, why is the `dbus` feature not enabled?

Re: [PR REVIEW] niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913991066

Comment:
would be better to use something like `v$version`, as

1. hardcoding things like that is bad and will be forgotten at some point
2. we build from the tag, which is a reference to the commit

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913991355

Comment:
This variable is in accordance with Niri's own packaging guidelines

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913991355

Comment:
This variable is in accordance with Niri's own packaging guidelines, it is _on top of_ the reported version number

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913991355

Comment:
This variable is in accordance with Niri's own packaging guidelines, it is _on top of_ the reported version number, i.e. `niri 25.01 (e35c630)`

Re: [PR REVIEW] niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 350 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913992965

Comment:
maybe:
```sh
pre_check() {
    export XDG_RUNTIME_DIR="$mktemp -d "$wrksrc/runtime.XXXXXX")"
}
```

this will keep things contained inside the build directory and make it only used for tests

Re: [PR REVIEW] niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 420 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913994542

Comment:
upstreams do stuff like this all the time. if they aren't leaving the commit in their release tarballs somehow (like a file), we shouldn't need to hard-code it. we aren't building some random commit, we're building the release, so the commit information is redundant.

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1913997754

Comment:
Understood and agreed that it is redundant, however if it is expected by upstream, I'm not sure I really think it is worth it to break that expectation downstream is all (i.e. for bug reports and such)

Re: niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by trolljoe on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588560285

Comment:
> Works fine for me! Might I ask, however, why is the `dbus` feature not enabled?

i will update the template including that, my bad

Re: niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588561840

Comment:
> i will update the template including that, my bad
Np, there may be legitimate reasons for it actually since I am not *100%* sure what it does, but I feel it may be useful, so I wouldn't mind if someone more experienced than me on these matters could weigh in too

Re: niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 414 bytes --]

New comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588561840

Comment:
> i will update the template including that, my bad

Np, there may be legitimate reasons for it actually since I am not *100%* sure what it does, but I feel it may be useful, so I wouldn't mind if someone more experienced than me on these matters could weigh in too

Re: niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

New comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588561840

Comment:
> i will update the template including that, my bad

Np, there may be legitimate reasons for it actually since I am not *100%* sure what it does (but Works For Me:tm: without `elogind` for instance), but I feel it may be useful, so I wouldn't mind if someone more experienced than me on these matters could weigh in too

Re: niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 467 bytes --]

New comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2588561840

Comment:
> i will update the template including that, my bad

Np, there may be legitimate reasons for it actually since I am not *100%* sure what it does (but Works For Me™ without `elogind` for instance), but I feel it may be useful, so I wouldn't mind if someone more experienced than me on these matters could weigh in too

Re: [PR REVIEW] niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

New review comment by trolljoe on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914005107

Comment:
is the syntax correct? wouldn't i use this instead?

```sh
pre_check() {
    export XDG_RUNTIME_DIR=$(mktemp -d "$wrksrc/runtime.XXXXXX")
}
```

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914008625

Comment:
Methinks it is a typo, but mind the additional quotes:
```shell
pre_check() {
    export XDG_RUNTIME_DIR="$(mktemp -d "$wrksrc/runtime.XXXXXX")"
}
```

Re: [PR REVIEW] niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914008861

Comment:
If upstream wants this information to be accurate, they should add it to their release artifacts. they already generate them to vendor cargo dependencies.

Re: [PR REVIEW] niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914009319

Comment:
yes mine was missing a `(`

Re: [PR PATCH] [Updated] niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

There is an updated pull request by trolljoe against master on the void-packages repository

https://github.com/trolljoe/void-packages niri
https://github.com/void-linux/void-packages/pull/53946

niri: update to 25.01
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

this goes by the new packaging niri page (https://github.com/YaLTeR/niri/wiki/Packaging-niri), if setting XDG_RUNTIME_DIR to `mktemp` isn't enough i'll skip the tests.

A patch file from https://github.com/void-linux/void-packages/pull/53946.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-niri-53946.patch --]
[-- Type: text/x-diff, Size: 2502 bytes --]

From 1eb21be3e4bae601fc0087a4d22b92012e1bac71 Mon Sep 17 00:00:00 2001
From: Joetroll <joetroll@proton.me>
Date: Sun, 12 Jan 2025 15:23:37 -0300
Subject: [PATCH 1/2] niri: update to 25.01

---
 srcpkgs/niri/template | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/niri/template b/srcpkgs/niri/template
index 0fb83c6b62dbec..26a83b97cf5d90 100644
--- a/srcpkgs/niri/template
+++ b/srcpkgs/niri/template
@@ -1,6 +1,6 @@
 # Template file for 'niri'
 pkgname=niri
-version=0.1.10.1
+version=25.01
 revision=1
 build_style=cargo
 configure_args="--no-default-features --features xdp-gnome-screencast"
@@ -13,7 +13,10 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/YaLTeR/niri"
 changelog="https://github.com/YaLTeR/niri/releases"
 distfiles="https://github.com/YaLTeR/niri/archive/refs/tags/v${version}.tar.gz"
-checksum=d8854830436a87215b0bc6a60b6d43f350d927a03a2798c75f0fbda228bac8d3
+checksum=86b89bcfc3fc6a8ed81f9e3f0ac7a29bd30267515efb2c19e1e0bc2ccd67b649
+
+export NIRI_BUILD_COMMIT="e35c630"
+export XDG_RUNTIME_DIR="$(mktemp -d)"
 
 post_install() {
 	vinstall resources/niri.desktop 644 usr/share/wayland-sessions

From 490a876c38557c44e3a26469c9008a782980bfae Mon Sep 17 00:00:00 2001
From: Joetroll <joetroll@proton.me>
Date: Sun, 12 Jan 2025 15:23:37 -0300
Subject: [PATCH 2/2] niri: update to 25.01

---
 srcpkgs/niri/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/niri/template b/srcpkgs/niri/template
index 26a83b97cf5d90..652bc5b63866ab 100644
--- a/srcpkgs/niri/template
+++ b/srcpkgs/niri/template
@@ -3,7 +3,7 @@ pkgname=niri
 version=25.01
 revision=1
 build_style=cargo
-configure_args="--no-default-features --features xdp-gnome-screencast"
+configure_args="--no-default-features --features dbus,xdp-gnome-screencast"
 hostmakedepends="pkg-config clang18-devel"
 makedepends="eudev-libudev-devel libxkbcommon-devel libinput-devel libgbm-devel
  libdisplay-info-devel pipewire-devel pango-devel libseat-devel clang18-devel"
@@ -15,8 +15,9 @@ changelog="https://github.com/YaLTeR/niri/releases"
 distfiles="https://github.com/YaLTeR/niri/archive/refs/tags/v${version}.tar.gz"
 checksum=86b89bcfc3fc6a8ed81f9e3f0ac7a29bd30267515efb2c19e1e0bc2ccd67b649
 
-export NIRI_BUILD_COMMIT="e35c630"
-export XDG_RUNTIME_DIR="$(mktemp -d)"
+pre_check() {
+	export XDG_RUNTIME_DIR=$(mktemp -d "$wrksrc/runtime.XXXXXX")
+}
 
 post_install() {
 	vinstall resources/niri.desktop 644 usr/share/wayland-sessions

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 355 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914017272

Comment:
Fair point, I might poke upstream to add that, but then tbh I think it is best to just not add any environment variable, since it will report `(unknown commit)` by default, which is more meaningful here

Re: [PR REVIEW] niri: update to 25.01

[chilledfrogs]

[-- Attachment #1: Type: text/plain, Size: 376 bytes --]

New review comment by chilledfrogs on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#discussion_r1914017272

Comment:
Fair point, I might poke upstream to add that, but then tbh I think it is best to just not add any environment variable as @trolljoe did now, since it will report `(unknown commit)` by default, which is more meaningful here

Re: [PR PATCH] [Updated] niri: update to 25.01

[trolljoe]

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

There is an updated pull request by trolljoe against master on the void-packages repository

https://github.com/trolljoe/void-packages niri
https://github.com/void-linux/void-packages/pull/53946

niri: update to 25.01
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

this goes by the new packaging niri page (https://github.com/YaLTeR/niri/wiki/Packaging-niri), if setting XDG_RUNTIME_DIR to `mktemp` isn't enough i'll skip the tests.

A patch file from https://github.com/void-linux/void-packages/pull/53946.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-niri-53946.patch --]
[-- Type: text/x-diff, Size: 1454 bytes --]

From b9118ffad7b68495e3dea8de55c88e7e7dd33f0d Mon Sep 17 00:00:00 2001
From: Joetroll <joetroll@proton.me>
Date: Sun, 12 Jan 2025 15:23:37 -0300
Subject: [PATCH] niri: update to 25.01

---
 srcpkgs/niri/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/niri/template b/srcpkgs/niri/template
index 0fb83c6b62dbec..652bc5b63866ab 100644
--- a/srcpkgs/niri/template
+++ b/srcpkgs/niri/template
@@ -1,9 +1,9 @@
 # Template file for 'niri'
 pkgname=niri
-version=0.1.10.1
+version=25.01
 revision=1
 build_style=cargo
-configure_args="--no-default-features --features xdp-gnome-screencast"
+configure_args="--no-default-features --features dbus,xdp-gnome-screencast"
 hostmakedepends="pkg-config clang18-devel"
 makedepends="eudev-libudev-devel libxkbcommon-devel libinput-devel libgbm-devel
  libdisplay-info-devel pipewire-devel pango-devel libseat-devel clang18-devel"
@@ -13,7 +13,11 @@ license="GPL-3.0-or-later"
 homepage="https://github.com/YaLTeR/niri"
 changelog="https://github.com/YaLTeR/niri/releases"
 distfiles="https://github.com/YaLTeR/niri/archive/refs/tags/v${version}.tar.gz"
-checksum=d8854830436a87215b0bc6a60b6d43f350d927a03a2798c75f0fbda228bac8d3
+checksum=86b89bcfc3fc6a8ed81f9e3f0ac7a29bd30267515efb2c19e1e0bc2ccd67b649
+
+pre_check() {
+	export XDG_RUNTIME_DIR=$(mktemp -d "$wrksrc/runtime.XXXXXX")
+}
 
 post_install() {
 	vinstall resources/niri.desktop 644 usr/share/wayland-sessions

Re: niri: update to 25.01

[lukeflo]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

New comment by lukeflo on void-packages repository

https://github.com/void-linux/void-packages/pull/53946#issuecomment-2589330232

Comment:
> Might I ask, however, why is the `dbus` feature not enabled?

@trolljoe it wasn't enabled in the former version, if I'm right? However, I didn't have recognised any drawbacks even without `dbus` feature, simply starting niri with `dbus-session-run niri`. Just as information... 😉 

Re: [PR PATCH] [Merged]: niri: update to 25.01

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There's a merged pull request on the void-packages repository

niri: update to 25.01
https://github.com/void-linux/void-packages/pull/53946

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->

this goes by the new packaging niri page (https://github.com/YaLTeR/niri/wiki/Packaging-niri), if setting XDG_RUNTIME_DIR to `mktemp` isn't enough i'll skip the tests.

Re: niri: update to 25.01.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53963#issuecomment-2588541654

Comment:
duplicate of #53946