3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

262 commits

Author SHA1 Message Date
Jan Tojnar 67879a9353
Merge pull request #153398 from jtojnar/tracker-subcommands
nixos/tracker: Define env var so it can find miners’ subcommands
2022-01-09 16:09:35 +01:00
Jan Tojnar 283c47bc45
Merge pull request #150548 from K900/wireplumber
wireplumber: init, add NixOS module
2022-01-08 06:11:59 +01:00
Jan Tojnar 0c4ccc29ce
Merge pull request #153840 from bobby285271/gsd
nixos/gnome-settings-daemon: pick up correct .wants directories
2022-01-08 06:07:14 +01:00
Bobby Rong 84ad67f7c6
nixos/gnome-settings-daemon: pick up correct .wants directories
In https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/153
the user target names for GSD components has been renamed for example
from `gsd-a11y-settings.target` to `org.gnome.SettingsDaemon.A11ySettings.target`,
and nowadays `gsd-*.target` are just symbolic links of `/dev/null` and will be
removed in the future.

At the same time, as mentioned in d27212d466,
we are adding `systemd.user.targets.<name>.wants` stuff here only because
systemd.packages doesn't pick the .wants directories. Nowadays those GSD components
are managed in `/etc/systemd/user/gnome-session@gnome.target.d/gnome.session.conf`
so it should be safe to remove them.

In this commit we also try to pick up those new .wants directories, see also
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/blob/41.0/plugins/meson.build#L57

Result of `cd /nix/store/iqzy2a6wn9bq9hqx7pqx0a153s5xlnwp-gnome-settings-daemon-41.0; find | grep wants`:

```
./share/systemd/user/gnome-session-x11-services-ready.target.wants
./share/systemd/user/gnome-session-x11-services-ready.target.wants/org.gnome.SettingsDaemon.XSettings.service
./share/systemd/user/gnome-session-x11-services.target.wants
./share/systemd/user/gnome-session-x11-services.target.wants/org.gnome.SettingsDaemon.XSettings.service
```

Result of `cd /nix/store/armzljlnsvc1gn0nq0bncb9lf8fy32zy-gnome-settings-daemon-3.34.0; find | grep wants`:

```
./lib/systemd/user/gnome-session-initialized.target.wants
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-a11y-settings.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-color.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-datetime.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-power.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-housekeeping.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-keyboard.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-media-keys.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-screensaver-proxy.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sharing.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sound.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-smartcard.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wacom.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-print-notifications.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-rfkill.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wwan.target
./lib/systemd/user/gnome-session-x11-services.target.wants
./lib/systemd/user/gnome-session-x11-services.target.wants/gsd-xsettings.target
```
2022-01-08 10:19:02 +08:00
K900 4909a15582 nixos/wireplumber: init
This is extremely basic for now, but we can add more stuff later
2022-01-07 17:34:28 +03:00
Jörg Thalheim 989238ec03
Merge pull request #153426 from 4z3/systemwide-pipewire
nixos/pipewire: add systemWide option
2022-01-05 21:33:07 +00:00
Robert Hensing 70d27303da
Merge pull request #149532 from pennae/split-docs-build
nixos/*: split docs build
2022-01-04 22:33:23 +01:00
Jan Tojnar dafaecb3b9 nixos/gvfs: fix libmtp udev package path for realz
bin is the primary output so the previous attempt at fixing this
(2d7fc66c79)
was a no-op.
2022-01-04 19:22:05 +01:00
tv 7678a5848c nixos/pipewire: add systemWide option 2022-01-04 16:07:07 +01:00
Jan Tojnar 3c1b474e44 nixos/tracker: Define env var so it can find miners’ subcommands
tracker looks in its directory tree for executable files
to make available as subcommands. Users expect to find subcommands
from tracker-miners package but that fails as they are in different
tree. We also cannot change the lookup path since tracker-miners
also depends on a library from tracker package.

Until we can break the dependency cycle on package level:

   tracker -> tracker-miners -> tracker-sparql (tracker)

we need to work around it. I chose to set an environment
variable that overrides the subcommands lookup to a tree
symlinking files from both packages in GNOME NixOS module.

https://gitlab.gnome.org/GNOME/tracker/-/issues/341
Fixes: https://github.com/NixOS/nixpkgs/issues/153378
2022-01-03 22:25:03 +01:00
pennae fc614c37c6 nixos/documentation: split options doc build
most modules can be evaluated for their documentation in a very
restricted environment that doesn't include all of nixpkgs. this
evaluation can then be cached and reused for subsequent builds, merging
only documentation that has changed into the cached set. since nixos
ships with a large number of modules of which only a few are used in any
given config this can save evaluation a huge percentage of nixos
options available in any given config.

in tests of this caching, despite having to copy most of nixos/, saves
about 80% of the time needed to build the system manual, or about two
second on the machine used for testing. build time for a full system
config shrank from 9.4s to 7.4s, while turning documentation off
entirely shortened the build to 7.1s.
2022-01-02 19:46:13 +01:00
Bernardo Meurer 2d7fc66c79
nixos/gvfs: fix libmtp udev package path
As pointed out by @sigprof[1] my bump of libmtp silently broke this, as I
moved the udev files out of the bin output of the pkg.

[1]: https://github.com/NixOS/nixpkgs/pull/144290#discussion_r775266642
2021-12-26 20:05:14 -03:00
Jan Tojnar bcb4b714bd Revert "nixos: make GIO_EXTRA_MODULES a session variable"
This reverts commit abfcb79abf.

Fixes: https://github.com/NixOS/nixpkgs/issues/149539
2021-12-08 19:54:18 +01:00
Jan Tojnar 75eaab3757
Merge pull request #126832 from ncfavier/gio-extra-modules
nixos: make GIO_EXTRA_MODULES a session variable
2021-12-06 16:23:48 +01:00
Sandro Jäckel 8547db919a
treewide: switch `builtins.fromJSON(builtins.readFile ./file.json)` to lib.importJSON ./file.json 2021-11-03 14:43:52 +01:00
Jan Solanti b3bcf51c05 pipewire: 0.3.38 -> 0.3.39
Split pipewire-media-session into its own package
2021-10-25 20:34:40 +03:00
Jan Solanti b65f74fd98 pipewire-media-session: init at 0.4.0 2021-10-25 20:34:40 +03:00
Robert Hensing 0699530f08
Merge pull request #136909 from ncfavier/cleanup-defaults-examples
nixos/doc: clean up defaults and examples
2021-10-04 20:37:42 +02:00
Naïm Favier 2ddc335e6f
nixos/doc: clean up defaults and examples 2021-10-04 12:47:20 +02:00
Jan Solanti c12e8a63ba pipewire: 0.3.36 -> 0.3.37 2021-09-25 17:51:39 +03:00
Artturi 3b2440afd0
Merge pull request #100120 from unode/cpupower-gui
linuxPackages.cpupower-gui: init at 1.0.0
2021-09-21 03:37:10 +03:00
davidak dfa2dd95c2
Merge pull request #138434 from bobby285271/pantheon-team
treewide: switch from pantheon.maintainers to lib.teams.pantheon
2021-09-19 02:58:11 +02:00
Guillaume Girol ceb2e6667b
Merge pull request #126289 from rnhmjoj/wrappers
nixos/security/wrappers: make well-typed
2021-09-18 15:28:49 +00:00
Bobby Rong 0fd8cc3908
treewide: switch from pantheon.maintainers to lib.teams.pantheon 2021-09-18 23:07:00 +08:00
Jan Solanti 996b51ee85 pipewire: 0.3.35 -> 0.3.36 2021-09-16 18:52:08 +03:00
rnhmjoj fedd7cd690
nixos: explicitely set security.wrappers ownership
This is slightly more verbose and inconvenient, but it forces you
to think about what the wrapper ownership and permissions will be.
2021-09-13 13:48:13 +02:00
Jan Solanti f4fbb21176 pipewire: 0.3.34 -> 0.3.35 2021-09-12 16:33:50 +03:00
Artturin 756e60344f nixos/pipewire: use absolute path for jack libs 2021-09-02 17:17:15 +03:00
Ilan Joselevich 70de7b5b45 pipewire: 0.3.33 -> 0.3.34 2021-08-26 20:33:18 +03:00
Ilan Joselevich a876500f5d pipewire: updated JSON configs 2021-08-06 16:50:56 +03:00
davidak 8f02a4486d pantheon: add maintainers team 2021-08-02 19:09:29 +02:00
Renato Alves 05e0e96c3a
cpupower-gui: init at 1.0.0 2021-07-28 20:00:42 +02:00
arcnmx ef532a0443 nixos/pipewire: add bluez hardware database 2021-07-04 16:20:57 -07:00
arcnmx eb7e40f9c9 pipewire: 0.3.30 -> 0.3.31 2021-06-28 12:37:46 -07:00
legendofmiracles 3e7ec42d68
espanso: add runtime dependencies correctly, nixos/espanso remove path hack 2021-06-14 13:09:57 -06:00
Naïm Favier abfcb79abf
nixos: make GIO_EXTRA_MODULES a session variable
Allow applications started by the systemd user session manager to find
their GIO_EXTRA_MODULES.
2021-06-14 14:11:13 +02:00
Jan Solanti c702cc4321 pipewire: 0.3.27 -> 0.3.30 2021-06-09 19:46:51 +03:00
Jan Tojnar ed47351533
nixos/flatpak: Remove guiPackages internal option
It was basically just a `environment.systemPackages` synonym,
only GNOME used it, and it was stretching the responsibilities
of the flatpak module too far.

It also makes it cleaner to avoid installing the program
using GNOME module’s `excludePackages` option.

Partially reverts: https://github.com/NixOS/nixpkgs/pull/101516
Fixes: https://github.com/NixOS/nixpkgs/issues/110310
2021-05-18 14:06:23 +02:00
Vladimír Čunát 080cd658ca
Merge #121780: treewide meta.maintainers tweaks 2021-05-08 10:47:08 +02:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Vladimír Čunát 9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
talyz fb86d324d1
pipewire: Add update script 2021-04-27 16:50:22 +02:00
talyz 24320ba1dd
pipewire: 0.3.25 -> 0.3.26 2021-04-27 12:41:30 +02:00
Jan Solanti f94c84f844 pipewire: 0.3.24 -> 0.3.25 2021-04-07 16:23:43 +03:00
talyz 2a3c276b53
nixos/pipewire: Use formats.json, stricter typing, line breaks
The upstream pipewire config is written in an almost, but not quite
JSON format. The parser accepts standard JSON, though, so we don't
need to write our file in the same nonstandard version.

The typing for all config options is changed from `types.attrs`, which
behaves poorly when the option is set from multiple locations, to the
formats.json-type.

Also, rewrite some very long one-liners for improved readability.
2021-04-01 12:08:29 +02:00
Peter Hoeg 860e87d363 nixos/geoclue2: do not start geoclue agent for system users 2021-03-29 16:57:49 +08:00
Jan Solanti fbdb248e54 pipewire: 0.3.23 -> 0.3.24 2021-03-19 05:14:44 +02:00
Jan Solanti b012ecaae7 pipewire: 0.3.22 -> 0.3.23 2021-03-05 00:41:02 +02:00
Jan Solanti 78bfbdd77a pipewire: 0.3.21 -> 0.3.22 2021-03-05 00:39:32 +02:00
Jörg Thalheim f3918b4bc3
nixos/pipewire: only enable media-session if pipewire is enabled 2021-02-20 13:42:18 +01:00