[WIP] Merge master into staging-next #69439
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avoid assertion in nixos/modules/system/boot/resolved.nix if service systemd-resolved is enabled.
The activation script is needed to get the missing files in etc/ created. Needed for container manager like systemd-nspawn.
Don’t strip for OCaml 4.04
ocamlPackages.sequence/iter: 1.1 → 1.2.1 Ensures compatibility with OCaml 4.08
djview: adopt djview: upd description djview: add longDescription djview: upd to Qt5, use Qt5's mkDerivation djview: add configureFlags (enabling couple features) upd longDescription djview: upd clean-up
Although hopefully this can eventually be added to nodePackages, it uses
some devDependencies to build custom fonts. Node2nix doesn't currently
support enabling devDependencies for a single package.
- Got rid of redundant let-in statements.
- node-packages.json now only pulls in Iosevka.
- generate.sh
* Uses a nix-shell shebang to ensure it builds using the current
version of node2nix (the old version caused some issues due to the
19.03 release version being 1.6.0 instead of 1.7.0).
* Builds in development mode to fix the devDependencies issue.
- Use the tree of the built node package as sourceRoot instead of
installing node dependencies manually. This means the source will have
to be updated in both node-packages.json and default.nix, but to make
things easier the derivation inherits the version number.
- Disparate build options now all live under privateBuildPlan, which is
converted first with builtins.toJSON and then to TOML using remarshal
(Unfortunately there is not currently a builtins.toTOML).
- Extra parameters can also be provided that will be converted to JSON
then TOML. This will overwrite the default parameters.toml file.
A ton of tests fail and it's not obvious to me how to fix them. Adding bleach to checkInputs fixes a tiny number of them, though.
…to avoid issues with PrivateTmp=true
Document the breaking secret option transition from literal secrets to file-based ones.
The state path now, since the transition from initialization in preStart to using systemd-tmpfiles, has the following restriction: no parent directory can be owned by any other user than root or the user specified in services.gitlab.user. This is a potentially breaking change and the cause of the error isn't immediately obvious, so document it both in the release notes and statePath description.
VBoxClient needs a RUNPATH entry to dlopen libXfixes successfully. Fixes NixOS#65542
this should always work, even on android / iOS toolchains
ofborg
bot
added
6.topic: nixos
6.topic: pantheon
|
@GrahamcOfBorg eval |
Fixes eval after NixOS#69072 Resolved conflict in pkgs/tools/security/thc-hydra/default.nix Basically had to revert a1c0e10 which adapts NixOS#69210 to master that doesn't yet have 329a88e
veprbl
force-pushed
the
eval/staging
branch
from
72f3289
to
ed4867c
Compare
veprbl
changed the title
|
@GrahamcOfBorg eval |
|
Eval failed because the target branch doesn't evaluate without the merge (this is the reason why I'm doing the merge) cc NixOS/ofborg#25 |
veprbl
removed
6.topic: GNOME
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes eval after #69072
Resolved conflict in pkgs/tools/security/thc-hydra/default.nix
Basically had to revert a1c0e10 which adapts #69210 to master that doesn't yet have 329a88e