Skip to content

modemmanager: 1.18.12 → 1.20.4#214086

Merged
jtojnar merged 3 commits intoNixOS:stagingfrom
jtojnar:modemmanager
Feb 3, 2023
Merged

modemmanager: 1.18.12 → 1.20.4#214086
jtojnar merged 3 commits intoNixOS:stagingfrom
jtojnar:modemmanager

Conversation

@jtojnar
Copy link
Member

@jtojnar jtojnar commented Feb 2, 2023

Description of changes
Things done
  • pkg-config files look okay
  • output diffs look okay
  • news look okay
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

- Tarballs no longer available.
- Autotools no longer supported.
- Formatting the expression.
- Dropped default configure flags (`--with-polkit` implies `yes`, which gets interpreted as `strict` on Autotools, which is the default with Meson; `systemd_suspend_resume` and `systemd_journal` default to `true` with Meson)
- Dropped flags for paths that can be obtained from pkg-config (does not work for udev).

https://lists.freedesktop.org/archives/modemmanager-devel/2022-October/009455.html
https://lists.freedesktop.org/archives/wayland-devel/2022-November/042515.html
https://lists.freedesktop.org/archives/modemmanager-devel/2022-November/009525.html
https://lists.freedesktop.org/archives/modemmanager-devel/2022-December/009563.html
@jtojnar jtojnar requested a review from bobby285271 February 2, 2023 01:43
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Feb 2, 2023
@jtojnar jtojnar merged commit c2b3bb6 into NixOS:staging Feb 3, 2023
@jtojnar jtojnar deleted the modemmanager branch February 3, 2023 13:38
@alyssais
Copy link
Member

Hmm, 233dac2 doesn't build for me on x86_64-linux. I wonder how OfBorg managed it…

modemmanager> Installation failed due to insufficient permissions.
modemmanager> Attempting to use polkit to gain elevated privileges...
modemmanager> pkexec must be setuid root
modemmanager> FAILED: meson-internal__install
modemmanager> /nix/store/754p0izaawcr1v28i0k3xbbj2r3m27n2-meson-0.64.1/bin/meson install --no-rebuild
modemmanager> ninja: build stopped: subcommand failed.
error: build of '/nix/store/3yzwywmxb3hkcsqpsc1s58lrq63lfnlk-modemmanager-1.20.4.drv' failed

@alyssais
Copy link
Member

Works for me on another system with a more recent Nix so probably a Nix bug that got fixed along the way.

@alyssais
Copy link
Member

Okay, as it turns out this package should have failed to build, and only worked due to a regression in Nix.

From the OfBorg log:

Installing /build/source/build/data/org.freedesktop.ModemManager1.conf to /etc/dbus-1/system.d

This should not have worked.

@alyssais
Copy link
Member

We can set -Ddbus_policy_dir to fix D-Bus file installation, but the new example files can't be disabled. I've opened an upstream MR to add an option to disable installing those.

@jtojnar
Copy link
Member Author

jtojnar commented Feb 12, 2023

Ugh I assumed the option is not necessary anymore due to the path being properly interpolated now but did not notice that it is interpolating sysconfdir. Must have been using Nix 2.12 as well.

But that line does not really make sense – it is getting sysconfdir from the pkg-config file and then replacing it wholesale with sysconfdir of the package. And the /etc path is deprecated for packages anyway.

@jtojnar
Copy link
Member Author

jtojnar commented Feb 12, 2023

@alyssais
Copy link
Member

As for the examples, it might be useful install them, maybe with something like https://github.com/NixOS/nixpkgs/blob/532f202b6490c646817796ba09e88c8b7bea74c1/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch

Useful for what? I don't mind installing stuff like that when it doesn't cause problems, but I'm fairly doubtful that people are going to go poking around in their Nix store to find examples.

@jtojnar
Copy link
Member Author

jtojnar commented Feb 12, 2023

When I want to edit fwupd settings on my NixOS system, I find running nix build .#fwupd in my config flake and looking at the commented config files in the output more convenient than looking at the fwupd version in the nixpkgs input of my flake, going to the repo and looking up the source file for the config with appropriate tag. But it’s just a nice to have, not something critical.

@jtojnar jtojnar mentioned this pull request Mar 5, 2023
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants