Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from NixOS:master #123

Merged
merged 170 commits into from
Dec 28, 2023
Merged

[pull] master from NixOS:master #123

merged 170 commits into from
Dec 28, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 28, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

Luflosi and others added 30 commits December 7, 2023 13:17
Let's test / on ZFS and /boot on ZFS in separate tests since the GRUB integration for ZFS seems to be not very well maintained.
If the test breaks in the future it's easier to figure out that ZFS on /boot is at fault and either fix the issue or disable the test.
The new test creates a ZFS pool where all features not compatible with GRUB2 are disabled. The dataset is then mounted on /boot and we check that the installer correctly generates a bootable configuration.
Try to use as many ZFS features as possible to verify that GRUB can handle them.
- Remove unused `config` argument
- Don't enable the xserver again, since the import `./common/x11.nix` already takes care of that
- Remove an empty line at the end
- Move each function argument into its own line for better git diffs in the future
- Use `finalAttrs` instead of `rec`
`autoconf-2.72` tweaked `AC_CHECK_LIB` macro a bit and exposed missing
quoting in `configure.in` of `0verkill` as:

    0verkill-unstable> ./configure: line 4182: syntax error near unexpected token `newline'
    0verkill-unstable> ./configure: line 4182: `yes:'

`configure.in` requires a bit of patching. Let's pin it to older `2.69`
to allow `autoconf` upgrade to 2.72.
Signed-off-by: Florian Brandes <[email protected]>
Without the change `libsidplayfp` fails the build on `autoconf-2.72` as:

    ./configure: line 19606: syntax error near unexpected token `;;'
    ./configure: line 19606: ` ;;'
alyssais and others added 28 commits December 28, 2023 15:05
python3Packages.ptpython: remove now superfluous black dependency
…s.django-filter

python310Packages.django-filter: 23.4 -> 23.5
home-assistant: 2023.12.3 -> 2023.12.4
…s.pyatmo

python311Packages.pyatmo: 8.0.1 -> 8.0.2
raspberrypi-eeprom: 2023.10.30-2712 -> 2023.12.06-2712
goverview: install shell completion files
nixos/tests/installer: test /boot on ZFS
rpi-imager: set meta.homepage to something useful, don't use finalAtt…
python311Packages.google-generativeai: 0.2.2 -> 0.3.2
python311Packages.internetarchive: 3.5.0 -> 3.6.0
nodePackages.@antora/cli: fix eval by removing `main-programs.nix` entry
python311Packages.losant-rest: 1.19.2 -> 1.19.3
python311Packages.aioskybell: 22.7.0 -> 23.12.0
…s.hvplot

python310Packages.hvplot: 0.9.0 -> 0.9.1
fwknop: pull fix for `autoconf-2.72` build pending upstream inclusion
@pull pull bot added the ⤵️ pull label Dec 28, 2023
@pull pull bot merged commit e2b40f6 into khaneliman:master Dec 28, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.