Commit Graph

854 Commits

Author SHA1 Message Date
nikstur
9a7c5c5eaa systemd: use stripExclude instead of manual workaround 2025-10-19 01:58:28 +02:00
Yureka
4b1c77fd4e systemd: new musl patchset 2025-10-12 23:58:09 +02:00
nixpkgs-ci[bot]
e55c47d481 Merge master into staging-next 2025-10-11 12:05:40 +00:00
Sergei Trofimovich
75114216e2 systemd: drop reference to deleted systemd-timesyncd nixos test
Without the change the eval fails as:

    $ nix build --no-link -f. defaultPkgConfigPackages.libsystemd.tests
    error:
       … while evaluating the attribute 'systemd-timesyncd'

       … in the condition of the assert statement
         at pkgs/os-specific/linux/systemd/default.nix:1023:11:
         1022|           name: value:
         1023|           assert lib.assertMsg (lib.isDerivation value) "${name} is not a derivation";
             |           ^
         1024|           value

       … in the left operand of the OR (||) operator
         at /home/slyfox/dev/git/nixpkgs-master/lib/asserts.nix:50:31:
           49|   # TODO(Profpatsch): add tests that check stderr
           50|   assertMsg = pred: msg: pred || throw msg;
             |                               ^
           51|

       error: attribute 'systemd-timesyncd' missing
       at pkgs/os-specific/linux/systemd/default.nix:1010:13:
         1009|             systemd-sysusers-password-option-override-ordering
         1010|             systemd-timesyncd
             |             ^
         1011|             systemd-timesyncd-nscd-dnssec
2025-10-11 09:31:37 +01:00
nixpkgs-ci[bot]
e23d356469 Merge staging-next into staging 2025-10-05 00:18:23 +00:00
K900
f8d669f413 Merge remote-tracking branch 'origin/master' into staging-next 2025-10-04 21:10:21 +03:00
NAHO
c8d4dabc43 pkgs: remove optional builtins prefixes from prelude functions
Remove optional builtins prefixes from prelude functions by running:

    builtins=(
      abort
      baseNameOf
      break
      derivation
      derivationStrict
      dirOf
      false
      fetchGit
      fetchMercurial
      fetchTarball
      fetchTree
      fromTOML
      import
      isNull
      map
      null
      placeholder
      removeAttrs
      scopedImport
      throw
      toString
      true
    )

    fd \
      --type file \
      . \
      pkgs \
      --exec-batch sed --in-place --regexp-extended "
        s/\<builtins\.($(
          printf '%s\n' "${builtins[@]}" |
            paste --delimiter '|' --serial -
        ))\>/\1/g
      "

    nix fmt
2025-10-04 19:02:37 +02:00
Grimmauld
5f76ca70fa systemdLibs: disable nspawn build
`nspawn` is not installed in `systemdLibs`, so building
it is unnecessary and can be skipped.
2025-10-04 00:18:11 +02:00
Will Fancher
70ca21d3c4 systemd: v257.9 -> v258 (#427968) 2025-10-03 16:06:12 -04:00
Arian van Putten
506887da09 systemd: remove systemd-lock-handler from passthru.tests
it's not an official systemd thing and we're not the maintainers of it.
Also the test is broken. But that is not our problem
2025-10-03 21:22:37 +02:00
Will Fancher
5da25f9301 systemd: Patch journald's Audit setting
https://github.com/systemd/systemd/pull/39069
2025-10-02 19:53:08 -04:00
Will Fancher
1c5d47dd78 systemd: v257.9 -> v258 2025-10-02 19:53:08 -04:00
nikstur
1ee16b1900 kbdVlock: split out of kbd
This removes a dependency cycle from systemd, removing a rebuild. At the
same time it is just as convenience for users. They need to include the
`kbdVlock` package now instead of the `vlock` output.
2025-09-29 18:21:01 +02:00
nixpkgs-ci[bot]
f08a85f704 Merge master into staging-next 2025-09-22 12:07:05 +00:00
matthewcroughan
a25da27e24 systemd: enable withBootloader on musl via patch 2025-09-21 13:26:47 +01:00
nixpkgs-ci[bot]
85b587287b Merge staging-next into staging 2025-09-15 12:07:44 +00:00
Florian Klink
9f84fea638 systemd: Drop POWER ELF ABI auto-detect patch (#442608) 2025-09-15 08:08:47 +02:00
K900
5e55633983 Merge remote-tracking branch 'origin/staging-next' into staging 2025-09-13 21:19:36 +03:00
OPNA2608
1ca9028ba2 systemd: Drop POWER ELF ABI auto-detect patch
Was backported and included in 257.8, fails to apply now.
2025-09-13 14:30:58 +02:00
Maximilian Bosch
7ca8298b9a systemd: use finalAttrs.version
I recently deployed systemd 257.9 to a bunch of machines as mitigation
for #440073. This caused some confusion in the aftermath since we had
257.9 deployed (via an override for `systemd.package` to not rebuild the
world), but `systemctl --version` still reported 257.8.

This patch fixes that problem by using the final version everywhere
instead of the version from the let-binding.

I decided to remove the let-binding entirely to avoid re-introducing the
wrong usage again.
2025-09-13 12:32:16 +02:00
nixpkgs-ci[bot]
1899bbae51 Merge staging-next into staging 2025-09-09 12:07:40 +00:00
Vladimír Čunát
f982d8382d systemdUkify: fixup build
This is basically a revert of a tiny part of PR #429972.
2025-09-09 09:01:36 +02:00
misilelab
0e70ce7d5a systemd: 257.8 -> 257.9
https://github.com/systemd/systemd/compare/v257.8...v257.9
close #439240 and #440073

Signed-off-by: misilelab <misileminecord@gmail.com>
2025-09-04 20:55:49 +09:00
Philip Taron
757ae81e03 systemd: 257.7 -> 257.8 (#431789) 2025-08-13 20:23:37 -07:00
nikstur
294b2f54af systemd: add bash to disallowedRequisites 2025-08-10 20:31:51 +02:00
nikstur
9ddad561cc systemd: remove bashInteractive
The only thing that needed bashInteractive were bash scripts for RPM.
Remove the RPM scripts (we definitely do not need) to get rid of
bashInteractive.
2025-08-10 20:31:51 +02:00
nikstur
4f4f18b9bb systemd: set debug-shell to upstream default /bin/sh
Using the ambient /bin/sh makes sense to use as the debug shell because
it's inherently something from the environment.

Some years ago this was changed to an explicit Nix Store path. However,
this doesn't really make sense and makes many things (like optionally
removing bash from the system) hard while not making anything easier or
better.
2025-08-10 20:31:51 +02:00
nikstur
c70f154403 systemd: remove iptables dependency
Since https://github.com/systemd/systemd/pull/17026 (v248 in 2020),
systemd can use nftables without any new dependency!

In 259, systemd plans to remove iptables suport altogether.
2025-08-10 20:31:51 +02:00
Grimmauld
219ca69138 systemdMinimal: fix build
Remove broken patches. The nspawn conditional can be omitted,
as it will not be installed on `systemdLibs` anyways.

Testing done:
```
    nix why-depends --precise .#systemdMinimal.out .#getent.out
    /nix/store/x2dhq7nb43xv2c3hh8y7g4bkdzndy7av-systemd-minimal-257.7
    └───bin/systemd-nspawn: …valid, ignoring....../nix/store/h5f0zw8gp3fsrzldsi9x2j29gqz6dv4h-getent-glibc-2.40-66/bin/getent…
        → /nix/store/h5f0zw8gp3fsrzldsi9x2j29gqz6dv4h-getent-glibc-2.40-66
```

```
    'git+file:///home/grimmauld/coding/nixpkgs#systemdLibs.out' does not depend on 'git+file:///home/grimmauld/coding/nixpkgs#getent.out'
```

`systemdMinimal`, `systemdLibs`, `pam` all builds.
`pkgsMusl.pam` evals successfully.
2025-08-10 17:18:31 +02:00
Grimmauld
0afdb39253 systemd: Don't build nspawn for systemdLibs 2025-08-10 11:05:24 +02:00
Grimmauld
0ce91c70d8 systemd: disable pam in transitive dependencies if pam is disabled 2025-08-10 11:05:20 +02:00
misilelab
d8e966cacc systemd: 257.7 -> 257.8
https://github.com/systemd/systemd/compare/v257.7...v257.8
Signed-off-by: misilelab <misileminecord@gmail.com>
2025-08-08 04:04:46 +09:00
nixpkgs-ci[bot]
6473890e0e Merge staging-next into staging 2025-07-31 18:06:45 +00:00
OPNA2608
4d286b56bf systemd: Re-enable BPF support on powerpc64le 2025-07-31 11:40:56 +02:00
nixpkgs-ci[bot]
a482dd935d Merge staging-next into staging 2025-07-30 18:07:01 +00:00
OPNA2608
3742a725a6 systemd: Detect ELF ABI version for bpf build on powerpc64 2025-07-26 13:14:24 +02:00
nixpkgs-ci[bot]
549bcf5bbc Merge staging-next into staging 2025-07-25 12:07:49 +00:00
Vladimír Čunát
059cdd0c79 systemd.disallowedReferences: avoid null values, really
I made a mistake and apparently I incorrectly tested
the commit 40df6d5813
Now with swapping these layers it evaluates again; easiest to try by
nix-build pkgs/top-level/release-cross.nix -A rpi.mpg123.aarch64-darwin --dry-run
2025-07-25 12:34:44 +02:00
Wolfgang Walther
90604d95bc Merge branch 'staging-next' into staging 2025-07-24 14:33:09 +02:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
nixpkgs-ci[bot]
41c8f4e751 Merge staging-next into staging 2025-07-19 12:07:12 +00:00
K900
98c4abb39a systemd: Use smaller bootctl patch. (#426601) 2025-07-19 12:14:43 +03:00
Will Fancher
a4d61af950 systemd: Use smaller bootctl patch.
The PR has been updated and simplified.
2025-07-19 04:10:45 -04:00
Philip Taron
807e04dd78 systemd: 257.6 -> 257.7 (#423479) 2025-07-17 21:18:09 -07:00
Vladimír Čunát
40df6d5813 systemd.disallowedReferences: avoid null values
hydra-queue-runner complains like this:
  loading build 302783324 (nixpkgs:cross-trunk:rpi-musl.mpg123.x86_64-linux)
  queue monitor: error:
         … while loading build 302783324:
         … while parsing derivation '/nix/store/8r46dmzzchv9jhb09y8dlih4h5k6smkm-systemd-minimal-armv6l-unknown-linux-musleabihf-257.6.drv'
         error: attribute 'disallowedReferences' must be a list of strings
  checking the queue for builds...
  loading build 302783295 (nixpkgs:cross-trunk:rpi-musl.mpg123.aarch64-darwin)
2025-07-17 13:22:11 +02:00
Jared Baur
cbb2734d99 systemd: add withSysupdate to passthru 2025-07-11 14:07:00 -07:00
Jared Baur
f7080c0606 systemd: add sysupdated 2025-07-11 14:06:58 -07:00
Will Fancher
b892dfe549 systemd: 257.6 -> 257.7 2025-07-08 09:40:59 -04:00
Guillaume Girol
abe472daf3 systemd: __structuredAttrs = true
neeeded by separateDebugInfo = true
2025-06-14 22:14:56 +02:00
Florian Klink
295567616e systemd: check udev rules outputs in installCheckPhase (#412703) 2025-06-04 11:46:32 +02:00