Skip to content

xdg-user-dirs: 0.18 -> 0.19#476704

Merged
drupol merged 1 commit intoNixOS:stagingfrom
limwa:xdg-user-dirs/0.19
Jan 4, 2026
Merged

xdg-user-dirs: 0.18 -> 0.19#476704
drupol merged 1 commit intoNixOS:stagingfrom
limwa:xdg-user-dirs/0.19

Conversation

@limwa
Copy link
Contributor

@limwa limwa commented Jan 3, 2026 •
edited
Loading

Updates xdg-user-dirs to 0.19.

  • Changes the build system to meson because I was having problems building with autoconf. Specifically, this instruction was being put into the generated configure file as-is and was causing problems because it's not valid bash code.
  • gettext is now used in Linux systems because the msgfmt executable is needed by meson to install the localization files.
  • libiconv and libintl were added to buildInputs because I think this is the correct way to specify those dependencies (please correct me if I'm wrong).
  • Replaced makeWrapper with makeBinaryWrapper.

Diff: https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/compare/0.18...v0.19?from_project_id=1232
Changelog: https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/blob/v0.19/NEWS?ref_type=tags#L1

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 3, 2026
@limwa
Copy link
Contributor Author

limwa commented Jan 3, 2026

I understand the PR needs to target staging, I'll take care of that later.

@limwa limwa force-pushed the xdg-user-dirs/0.19 branch 2 times, most recently from 1195d5f to f220991 Compare January 3, 2026 22:06
@limwa

This comment was marked as outdated.

Sign in to view
@limwa limwa force-pushed the xdg-user-dirs/0.19 branch 2 times, most recently from 40b7604 to c355c9a Compare January 3, 2026 22:23
@limwa
Copy link
Contributor Author

limwa commented Jan 3, 2026

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 476704 --package xdg-user-dirs
Commit: c355c9ac65cc953e192355e741934c282ff187ec (subsequent changes)
Merge: 0cae6d814fb0a2fabf2178c9002fe929ac8065a1

Logs: https://github.com/limwa/nixpkgs-review-gha/actions/runs/20683758620

x86_64-linux

✅ 1 package built:
  • xdg-user-dirs

aarch64-linux

✅ 1 package built:
  • xdg-user-dirs

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • xdg-user-dirs

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • xdg-user-dirs

@limwa limwa marked this pull request as ready for review January 3, 2026 22:38
@limwa limwa changed the base branch from master to staging January 3, 2026 22:44
@nixpkgs-ci nixpkgs-ci bot closed this Jan 3, 2026
@nixpkgs-ci nixpkgs-ci bot reopened this Jan 3, 2026
@limwa limwa mentioned this pull request Jan 3, 2026
Merged
13 tasks
@bobby285271 bobby285271 mentioned this pull request Jan 4, 2026
Merged
13 tasks
ghost
ghost reviewed Jan 4, 2026
View reviewed changes
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The update looks fine, the meson transition is welcome.

My comments are nits about making the diff cleaner

@limwa limwa force-pushed the xdg-user-dirs/0.19 branch from c355c9a to d09317e Compare January 4, 2026 15:25
@limwa limwa force-pushed the xdg-user-dirs/0.19 branch from d09317e to 514ae4e Compare January 4, 2026 15:32
@limwa limwa requested a review from a user January 4, 2026 15:33
drupol
drupol reviewed Jan 4, 2026
View reviewed changes
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 1 This PR was reviewed and approved by one person. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Jan 4, 2026
@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Jan 4, 2026
ghost
ghost approved these changes Jan 4, 2026
View reviewed changes
Copy link

@ghost ghost left a comment •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No further comments from me 👍

To summarize: this must be merged first then we can move onto #476719 and then #476727

@nixpkgs-ci nixpkgs-ci bot added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels Jan 4, 2026
@drupol drupol added this pull request to the merge queue Jan 4, 2026
Merged via the queue into NixOS:staging with commit ffecf90 Jan 4, 2026
42 of 44 checks passed
@limwa
Copy link
Contributor Author

limwa commented Jan 4, 2026

This PR needs to be backported to staging-25.11 by the way.

@drupol drupol added the backport staging-25.11 Backport PR automatically label Jan 4, 2026
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 4, 2026

Successfully created backport PR for staging-25.11:

@github-actions github-actions bot added the 8.has: port to stable This PR already has a backport to the stable release. label Jan 4, 2026
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 4, 2026
Merged
jtojnar
jtojnar reviewed Jan 5, 2026
View reviewed changes
pkgs/by-name/xd/xdg-user-dirs/package.nix

NIX_LDFLAGS = if stdenv.isDarwin then "-liconv" else null;

preFixup = ''
# fallback values need to be last
wrapProgram "$out/bin/xdg-user-dirs-update" \
--suffix XDG_CONFIG_DIRS : "$out/etc/xdg"

substituteInPlace "$out/lib/systemd/user/xdg-user-dirs.service" \
--replace-fail "/usr/bin/xdg-user-dirs-update" "$out/bin/xdg-user-dirs-update"
Copy link
Member

@jtojnar jtojnar Jan 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opened https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/22

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar jtojnar left review comments

@drupol drupol drupol approved these changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@donovanglover donovanglover Awaiting requested review from donovanglover

@iFreilicht iFreilicht Awaiting requested review from iFreilicht

+1 more reviewer
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 8.has: port to stable This PR already has a backport to the stable release. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. backport staging-25.11 Backport PR automatically

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@limwa @drupol @jtojnar @SuperSandro2000