Commit Graph

365 Commits

Author SHA1 Message Date
Florian Klink
b92942f466 systemd: use withPortabled in mesonFlags
No matter what withPortabled was being set, we always passed
-Dportabled=false in mesonFlags. Fix this.

Also, nixpkgs-fmt the file for consistency.
2020-11-25 00:22:37 +01:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Finn Behrens
7787fd2413 systemd: Add an option for homed
This is disabled by default to indicate that is hasn't been adiquately
tested with NixOS yet.
2020-11-03 17:35:26 -05:00
Antoine Eiche
859a44ebc0 systemd: set withRemote true by default
This also adds the libmicrohttpd as a `buildInput` when `withRemote`
is true.
2020-11-02 09:07:52 +01:00
Florian Klink
6dbc23e75d systemd: stop substituting inside fsck.c, stop substituting mke2fs
fsck.c doesn't refer to any of these binaries anymore, and the whole
systmed codebase not to /sbin/mke2fs.
2020-10-28 23:24:18 +01:00
Florian Klink
959cea2e80 systemd: add withPCRE2 option 2020-10-28 23:24:18 +01:00
Florian Klink
93dcbbf69d systemd: add withApparmor option 2020-10-28 23:24:18 +01:00
Florian Klink
065f057d0c systemd: add libgpgerror only to buildInputs if we build with resolved support 2020-10-28 23:24:18 +01:00
Florian Klink
e6dff1d666 systemd: drop libffi from buildInputs
This isn't used anywhere.
2020-10-28 23:24:18 +01:00
Florian Klink
e10a9a8506 systemd: add withMachined flag 2020-10-28 23:24:18 +01:00
Florian Klink
8526662a33 systemd: add withNss flag 2020-10-28 23:24:18 +01:00
Florian Klink
a079a6f026 systemd: add withUserDb flag 2020-10-28 23:24:18 +01:00
Florian Klink
e77326208e systemd: add withDocumentation flag 2020-10-28 23:24:18 +01:00
Florian Klink
f142493a6a systemd: add withShellCompletions flag 2020-10-28 23:24:18 +01:00
Florian Klink
1f9347431c systemd: add withPolkit option 2020-10-28 23:24:18 +01:00
Florian Klink
0b762c02ee systemd: disable efi if we don't build with withEfi is set to false 2020-10-28 23:24:17 +01:00
Florian Klink
54c35f0940 systemd: withEfi: move gnu-efi check into assertion 2020-10-28 23:24:17 +01:00
Florian Klink
13a910e3f6 systemd: make gcrypt optional 2020-10-28 23:24:17 +01:00
Florian Klink
585f4a140b systemd: add withAnalyze flag 2020-10-28 23:24:17 +01:00
Florian Klink
987906aa58 systemd: add withCoredump flag
… and default it to false for systemdMinimal
2020-10-28 23:24:17 +01:00
Florian Klink
c6aada2835 systemd: drop duplicate -Dlocaled=…
This is already configurable above.
2020-10-28 23:24:17 +01:00
Florian Klink
ff07c6b47d systemd: introduce withCompression flag
This will build systemd without some compression utils, useful for
systemdMinimal.
2020-10-28 23:24:17 +01:00
Florian Klink
5f257d7d2c systemd: cleanup cryptsetup input
use lib.getDev to retrieve the dev output. Don't pass it to buildInputs
if we don't build with withCryptsetup set to true.
2020-10-28 23:24:17 +01:00
Florian Klink
e1e01fa85e systemd: add withRemote option (default to false), make curl optional
This makes curl optional if both remote and importd are disabled, and
makes some assertions more robust by switching from curl.dev != null to
lib.getDev curl != null.
2020-10-28 23:24:17 +01:00
Florian Klink
39e733336c systemd: build without iptables when networkd is disabled
upstreams TODO mentions iptables-dev (libiptc) is also used for nspawn,
but it seems like it only makes use of this via networkd anyways (or
does these days) - at least systemdMinimal compiles successfully without
iptables in the build closure.
2020-10-28 23:24:17 +01:00
Florian Klink
8434da5715 systemd: remove perl from nativeBuildInputs
This was only used to patch a circular output reference from lib to out
on aarch64, but was removed in b68bddfbda,

This commit forgot to remove perl, so remove it now.
2020-10-28 23:24:17 +01:00
Florian Klink
6456e24d57 systemd: nixpkgs-fmt 2020-10-28 23:24:16 +01:00
Florian Klink
229184f6b5 systemd: reorder buildInputs
These are all unconditianally anyways.
2020-10-28 23:24:16 +01:00
Florian Klink
c6bbc945b4 systemd: stdenv.lib -> lib
This is a no-op and makes things a bit smaller.
2020-10-28 23:24:16 +01:00
Andreas Rammhold
5d03fe6ac4
Merge pull request #101792 from flokli/systemdminimal-without-glib
systemdMinimal: build without glib
2020-10-27 20:00:18 +01:00
Florian Klink
5f8a741abf systemdMinimal: build without glib
This takes glib (and by this, gtk-doc) out of systemdMinimal's build
closure.
2020-10-26 21:58:49 +01:00
Florian Klink
00c68337f5 systemd: fix 0019-*.patch
This was introduced in https://github.com/NixOS/nixpkgs/pull/99621, but
didn't follow the process documented in
pkgs/os-specific/linux/systemd/default.nix, namely, the `git am` and
`git format-patch` workflow, which caused
`0019-revert-get-rid-of-seat_can_multi_session.patch` to not apply with
`git am` due to missing authorship information.

I did apply this patch manually, and copied authorship information from
4e384ddc11.
2020-10-26 21:30:42 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Finn Behrens
2e52fca7c8
systemd: create options for smaller derivation
Co-Authored-By: Kirill Elagin <kirelagin@gmail.com>
2020-10-10 11:55:50 +02:00
Thomas Tuegel
b8318e2e5a
Merge pull request #99621 from ttuegel/staging--plasma-switch-user
systemd: show CanMultiSession again
2020-10-05 09:49:36 -05:00
Thomas Tuegel
4e384ddc11
systemd: show CanMultiSession again 2020-10-05 07:40:29 -05:00
Florian Klink
249b6f6b83 systemd: 246.5 -> 246.6 2020-09-27 16:45:27 +02:00
Andreas Rammhold
1f424f11ea systemd: 246.4 -> 246.5
Update to latest stable version. Changes:

d0f0f048ec sd-path: use ROOTPREFIX without suffixed slash
e662cf6d51 hashmap: make sure to initialize shared hash key atomically
da310c6b45 socket: downgrade log warnings about inability to set socket buffer sizes
ab6fcd9135 core: fix securebits setting
4f6925484d capability-util: add new function for raising setpcap
771436884d network: do not add prefix to RA if radv is not configured
fb2afc5f30 man: document the random delay of persistent timers
b2006ddc8f test-network: add test for ENOBUFS issue #17012
8758580ef5 backlight: do not claim that ID_BACKLIGHT_CLAMP= property is not set
57fc184a6c fs-util,tmpfiles: fix error handling of fchmod_opath()
db0f031e70 bootctl: don't accidentally propagate errors in "bootctl status"
3e2c806681 ethtool-util: don't pass error value that isn't used to log_syntax
b671730edb network: don't fail on various config parse errors
0ad86030c5 man: document that sd_bus_message_close_container() may only be called at end of container
f3da018017 cryptsetup: Fix null pointer dereference (#16987)
6f65eaf9c2 core: fix set keep caps for ambient capabilities
08338a234e core: fix comments on ambient capabilities
f0e6d9876d network: make log_link_error() or friends return void
35766dc61b core: make log_unit_error() or friends return void
3ed10b2ee8 core/slice: explicitly specify return value
2f6406914b udev: do not discard const qualifier
07671aa4cc sd-device: make log_device_error() or friends return void
d4bea73972 udev: explicitly specify return value
7db399be1e udev: return negative errno for invalid EVDEV_ABS_XXX= property
8c8d188e85 udev: make log_rule_error() or friends return void
4921375fd3 socket: fix copy/paste error
0f7fd97749 udev: warn if failed to set buffer size for device monitor
fc763d38d8 network: increase receive buffer size for device monitor
3bf7797f1f network: do not start device monitor if /sys is read-only
ebc0729c6a network: honor the buffer size specified in networkd.socket
ef3d2e178b core/socket: use fd_set_{rcv,snd}buf()
5dd4cc4b10 sd-device-monitor: use fd_set_rcvbuf()
fe9b92e566 util: introduce fd_set_{snd,rcv}buf()
4dcae66688 util: try to set with SO_{RCV,SND}BUFFORCE when requested size is larger than the kernel limit
4b6b523946 util: refuse to set too large value for socket buffer size
b4be8edb45 network: ignore error on increasing netlink receive buffer size
5ce47fb491 tree-wide: if get_block_device() returns zero devno, check for it in all cases
8ea6ec18e7 btrfs: if BTRFS_IOC_DEV_INFO returns /dev/root generate a friendly error message
e1ff4947d2 basic/log: make log_{info,warning,...} return void
8019995e9a tree-wide: correct cases where return log_{error,warning} is used without value
932f4c3e8b test-execute/exec-dynamicuser-statedir.service: fix quoting
16b9426f70 man: fix quickhelp listing in sysusers.d(5)
bde903d9e9 network: fix NDisc handling for the case when multiple routers exist
c965063b64 network: expose route_{hash,compare}_func()
6d24a40669 network: expose address_{hash,compare}_func()
054838a2e0 util: expose in6_addr_{hash,compare}_func()
58bd4a70de network: fixes gateway assignment through DHCPv4
8ad5382fe3 bash-completion: resolvectl: support 'log-level' command
a98bd75072 resolvectl: add 'log-level' to help message
78262fe807 core/socket: we may get ENOTCONN from socket_instantiate_service()
fecb3f00c4 homed: remember the secret even when the for_state is FIXATING_FOR_ACQUIRE
2020-09-27 16:45:27 +02:00
Florian Klink
6c5e621bad systemd: 246 -> 246.4
This bumps systemd to the latest stable maintenance release.

 - dc2e82af33 core: create per-user inaccessible node from the service manager
 - 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host
 - 2239965c29 coredump: don't convert s → µs twice
 - 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release
 - 9678a3daf6 varlink: do not parse invalid messages twice
 - 4e516dcbc1 userdbctl: add forgotten --output mode in help
 - aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords
 - 5933d77afe doc: cross link sd_listen_fd() docs a bit
 - 97fdde3239 Rework how we cache mtime to figure out if units changed
 - 0500968241 core: always try to reload not-found unit
 - 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts
 - 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache()
 - 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling
 - 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction
 - a1ba0fbef6 homed: fix log message to honor real homework path
 - d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901)
 - e42f9add21 analyze: fix error handling in one case
 - 4804ce1488 units: add missing usb-gadget.target
 - 5ad4e68c37 man: extend on the usec/sec discrepancy
 - 2fb612371d login/logind: Include sys/stat.h for struct stat usage
 - 5e884e7ee0 partition/makefs: Include missing sys/file.h header
 - 7bbc3807da network: dhcp6: logs only new address
 - 2056429e0f Don't run test-repart when loop devices are not available
 - dcbea51c5a man: clarify that several networkctl commands takes device names
 - 16e4cfcc82 networkctl: label command does not take any argument
 - 2352921244 missing: Add new Linux capability
 - 8b29c4a4f9 tty-ask-pw-agent: properly propagate error
 - f7ce2e9839 tty-ask-pw-agent: the message string might not be set
 - 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly
 - e1ce367d73 add "list" verb to autocompleted commands
 - 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl
 - a4236a2764 path: Improve $PATH search directory case
 - b7cef386bd path: Skip directories when finalising $PATH search
 - 122945f315 rules: don't install 80-drivers.rules when kmod is disabled
 - 42fab2d454 zsh: correct journalctl command completion parsing
 - ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :(
 - ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units
 - d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too
 - 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN
 - 6d802dd596 man: drop reference to long gone .busname unit type
 - a29656804b man: fix a fix of a typo in systemd.service example
 - 21ce0f5b33 network: can: Fix CAN initialization
 - cab5cde8c9 man: update autogenerated dbus api lists
 - 0d8000522b man: fix invalid tag place
 - ea94f218be man: add conditionals to more man pages
 - ef91325349 meson: add ENABLE_ANALYZE conditional
 - 83f7c0a7ec core: add missing conditions/asserts to unit file parsing
 - 716718155d analyze: rework condition testing
 - 5c4c7581bc sd-bus: fix error handling on readv()
 - 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties
 - 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names
 - 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env
 - 496a71f444 man: Fix typo in systemd-tmpfiles
 - 6c5d216ad8 homework: downgrade chattr failure log message
 - 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy
 - a21eaa2a3a homework: correct error passed into log message
 - 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place
 - 84e1ab74d2 homed: downgrade quota message in containers
 - 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls
 - 29854a5437 NEWS: clarify two points
 - 4cb4fb82f7 meson: add min version for libfdisk
 - 76331f86f6 load-fragment: fix grammar in error messages
 - 1e53c2d70f Fix function description in logind man page
 - 669066564d network: do not fail if UseMTU=yes on DHCP lease lost
 - a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc
 - 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha
 - 7875daf52b network: wait for previous address removal before configuring static addresses
 - 120064b4a1 network: only process non-error message
 - f44ec1de15 test: accept that char device 0/0 can now be created witout privileges
 - 946e4c43bb tools/make-man-index: fix purpose text that contains tags
 - dae0586e91 test-fs-util: skip encrypted path test if we get EACCES
 - 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat
 - fde6520d46 namespace: fix minor memory leak
 - 208ba581f4 man: fix incorrectly placed full stop
 - 6c81d57828 man: fix typo
 - 53a8d2588e bless-boot: add missing verb to --help
 - 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully
 - ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields
 - 972391ac39 fix typo in systemctl help
 - 443aacfcda man: clarify that LogNamespace= is for system services only
 - 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity
 - f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf'
 - dda6fec1df man: describe that changing Storage= does not move existing data
 - 2bbd33e476 core: reset bus error before reuse
 - b81504a3c7 nspawn: Fix incorrect usage of putenv
 - cb263973ac man: fix typo in systemd.service
 - 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename
2020-09-12 08:31:22 +02:00
Florian Klink
38044aac59 systemd: use tags as rev, update comment explaining updating workflow. 2020-08-13 20:51:39 +02:00
Florian Klink
c81c10624c gnupgMinimal: move to all-packages.nix, use from inside systemd
This makes things more consistent with how we pass in utillinuxMinimal.

There's already a minimal argument in the gnupg derivation, but this
gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we
define it inline inside systemd.
2020-08-13 20:51:39 +02:00
Florian Klink
2865490dc2 systemd: 245.7 -> 246 2020-08-13 20:51:39 +02:00
Florian Klink
b68bddfbda systemd: remove lib output
systemd 246 started baking in some strings into $lib/lib/libsystemd.so
which points back to $out.

It might be desirable to not have these strings in there, but instead
have systemd ask the running manager for the really active paths via
IPC, or patch in some more mutable paths (like /run/current-system/…) -
but as long as it is as it is, we should probably should just stop
producing the `lib` output for now.

This does increase the runtime closure for installations not pulling in
systemd.out, or linking against multiple libsystemd's, but doesn't
increase the runtime closure for NixOS itself, as it needs systemd
anyways, and doesn't link against multiple variants of it.

We can also remove the aarch64-specific $out/lib/systemd/catalog hack,
and revive it at a later time if the `lib` output is reintroduced.
2020-08-13 20:51:39 +02:00
Florian Klink
8e0b2b9177
Merge pull request #66856 from flokli/systemd-cryptsetup-lvm
systemd: build with cryptsetup support, add cryptsetup generators
2020-08-06 12:06:54 +02:00
Florian Klink
9f911ab1b5 systemd: 245.6 -> 245.7 2020-08-05 12:32:09 +02:00
Arian van Putten
29941db6bd systemd-cryptsetup-generator: remove
This package previously did override the systemd package, and instructed
ninja, systemd's previous build system, to only build the
cryptsetup-specific systemd generators (plus some manual rpath
massaging, as ninja install wasn't used).

Afterwards, users were expected to add this package to their
`systemd.generator-packages` (or since
https://github.com/NixOS/nixpkgs/pull/65376/files `systemd.packages`)
NixOS module options, so systemd will use these generators.

As the previous commit added cryptsetup support directly to the systemd
package (and pkgs.systemd now already ships the cryptsetup generators),
we don't need another package shipping the same generators.
2020-08-05 00:48:27 +02:00
Florian Klink
0a41d69968 systemd: substituteInPlace paths to mkswap and mke2fs (used in new cryptsetup-generator.c) 2020-08-05 00:46:59 +02:00
Florian Klink
72c8ed0389 systemd: build with cryptsetup and cryptsetup-generators
There's a circular dependency to systemd via cryptsetup and lvm2
(systemd -> cryptsetup -> lvm2 -> udev=systemd).

However, cryptsetup only really needs the devmapper component shipped
with lvm2. So build `pkgs.cryptsetup` with a lvm2 that doesn't come with
udev.
2020-08-05 00:46:57 +02:00
Florian Klink
ae896e090e systemd: disable remote support
This disabled systemd-journal-upload and systemd-journal-remote.

We didn't install the unit files anyways, so this was probably not used
at all, and currently fails to build due to libmicrohttpd and systemd
code being incompatible:

```
../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’:
../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types]
```
2020-07-31 18:38:07 +02:00