Navigation Menu

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

Custom kernel #109340

Closed
wants to merge 2,602 commits into from
Closed

Custom kernel #109340

wants to merge 2,602 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Jan 14, 2021

I can’t compile the kernel with my config. During the build, the default NixOS kernel config is generated.
My configuration system:
configuration.txt

NeQuissimus and others added 30 commits December 21, 2020 12:57
thermald >=2.3 supports the adaptive DPTF mode, in conjunction with
kernel 5.8.

NixOS 20.09 has 2.2, but this is useful for people that replace the
package with the later version, which is sometimes needed to do anyways.

(cherry picked from commit 0aaa5ad)
`nixos-rebuild build-vm-with-bootloader` currently fails with the
default NixOS EFI configuration:

  $ cat >configuration.nix <<EOF
  {
    fileSystems."/".device = "/dev/sda1";
    boot.loader.systemd-boot.enable = true;
    boot.loader.efi.canTouchEfiVariables = true;
  }
  EOF

  $ nixos-rebuild build-vm-with-bootloader -I nixos-config=$PWD/configuration.nix -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-20.09.tar.gz
  [...]
  insmod: ERROR: could not insert module /nix/store/1ibmgfr13r8b6xyn4f0wj115819f359c-linux-5.4.83/lib/modules/5.4.83/kernel/fs/efivarfs/efivarfs.ko.xz: No such device
  mount: /sys/firmware/efi/efivars: mount point does not exist.
  [    1.908328] reboot: Power down
  builder for '/nix/store/dx2ycclyknvibrskwmii42sgyalagjxa-nixos-boot-disk.drv' failed with exit code 32
  [...]

Fix it by setting virtualisation.useEFIBoot = true in qemu-vm.nix, when
efi is needed.

And remove the now unneeded configuration in
./nixos/tests/systemd-boot.nix, since it's handled globally.

Before:
* release-20.03: successful build, unsuccessful run
* release-20.09 (and master): unsuccessful build

After:
* Successful build and run.

Fixes #107255

(cherry picked from commit 39fad29)
This allows creating HTML presentations with
`asciidoctor-revealjs presentation.adoc`.

NOTE: The generated HTML file implicitly depend on reveal.js (and I see
no good way to bundle it with Nix). Either provide reveal.js in a local
path next to the generated HTML file[1], or override the revealjsdir
attribute, for example by pointing to an URL (can also be a path):

  asciidoctor-revealjs -a revealjsdir=https://cdn.jsdelivr.net/npm/reveal.js@3.9.2 presentation.adoc

Implementation details:
1. Added "gem 'asciidoctor-revealjs'" to the Gemfile.
2. Ran "nix-shell -p bundler --run 'bundle lock --update'"
   from pkgs/tools/typesetting/asciidoctor/.
3. Hand edited Gemfile.lock to remove all but the asciidoctor-revealjs
   changes. (Rationale: allow backporting to release-20.09.)
4. Finish off with "nix-shell -p bundix --run 'bundix'".

[1] Of course Nix can help with _that_, but that's external to the
asciidoctor-revealjs program.

(cherry picked from commit 8f13d3c)
This reverts commit 645b8a3.

Attempting to start any service from udev when systemd-udev-settle is
used at all hangs the boot for 2min. See issue #107341.
… derivation

See db236e5 "steam: Do $PATH lookup in steam.desktop [...]".
tl;dr: Otherwise widget/panel/desktop icons in DEs like KDE break.

As upstream's .desktop file does not contain any executable paths,
simply avoid substitution.

Message-Id: <97c3e797-d844-4d0a-9ccf-397745f83aeb@siticom.de>
(cherry picked from commit 251349d)
(cherry picked from commit 51c2129)
(cherry picked from commit 52ee36a)
(cherry picked from commit 8a4ac3e)
(cherry picked from commit 00d0fe5)
(cherry picked from commit bf5af02)
(cherry picked from commit 7e3fc72)
(cherry picked from commit eb85197)
enable and fix darwin build

(cherry picked from commit b45e4dd)
[20.09] docs: add -L to remaining curl install commands
(cherry picked from commit 7a8b30f)
Apparently, our NixOS tests need more RAM now. This was needed for e.g.
the `gitea`-test as well[1].

[1] affb72e

(cherry picked from commit 39ebc63)
ChangeLog: https://github.com/prometheus/prometheus/releases/tag/v2.23.0

* Applied a patch to fix a regression in release 2.23[1].

[1] prometheus/prometheus#8144

(cherry picked from commit 5a26fb3)
pacien and others added 2 commits January 14, 2021 09:34
(cherry picked from commit ea84262)

Reasons for backporting:

> Due to Discord API changes, the previous version will cease to work
> after 2020-11-07. Migration to this newer version being mandatory,
> this should be backported to the release-20.09 branch as well.

#102973
(cherry picked from commit c8d6ea6)

> https://github.com/restic/rest-server/releases/tag/v0.10.0 mentions
> three security fixes. I think we should backport this to 20.03 and
> 20.09.

#102054 (comment)
@Mic92
Copy link
Member

Mic92 commented Jan 14, 2021

If you have any commits you want to add to a PR, please open a new pull request with your own branch targeting nixpkgs/master.

@Mic92 Mic92 closed this Jan 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment