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

Merge master into tcp store branch #5

Open
wants to merge 2,965 commits into
base: tcp-store
Choose a base branch
from

Conversation

Ericson2314
Copy link

(And also one more commit of my own to make things slightly more type safe 33e95b1)

roberth and others added 30 commits January 18, 2023 01:55
…-test

Revert NixOS#6204 to fix regression, add nixpkgs/lib/tests as regression test
Add escape for systemd service in installer script
Restore support for channel: URLs in fetchTarball
`binary-caches` is deprecated and `substituters` the new recommended option.
OutputSpec: Allow all valid output names
Fix markdown error in operators.md
Fix update operator usage in operators.md
- make `<nixpkgs>` visible (was blank in the rendered version)
`file+https://example.org/test.mp4` should not be rejected with
`unexpected authority`.
define the terms "realise" and "valid" for store paths
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
doc: fix update operator description
Ericson2314 and others added 30 commits February 19, 2023 10:06
Improve hacking.md and add clangd+bear to devshell
- `nixpkgsFor` does all of native, static, cross, and the different stdenvs.

- The main Nix derivation is no longer duplicated for static.

- DRY nixpkgs.lib and lib.genAttrs calls.
The REPL itself and the `nix repl` CLI are conceptually different
things, and thus deserve to be in different files.
…lables

Keep splitting libcmd headers & files
It is independent of SourceExprCommand, which is about parsing
installables, except for the fact that parsing installables is one of
the many things influenced by read-only mode.
doc/hacking.md: Corrections and additions for cross
…-json

Move Derivation JSON printing logic to lib and test it
When I moved this code from the binary to libnixstore NixOS#7863, I forgot to
display the environment variables!
Wait with making /etc unwritable until after build env setup
I had given it an improper trailing comma in
1bd03ad.
Some dependencies supposed to be skipped in the cross build, along with
not using the gold linker. But in NixOS#6538
this was accidentally not preserved.

Also since NixOS#6538 we saw some new
aarch64-linux static build failures. This is a first attempt to try to
fix those failures. If this is not sufficient, there are other things we
can try next.
…atic

Fix `isStatic` arguments to `commonDeps`
There's only 24 hours in the day, so let's keep things down to a manageable state
It doesn't produce a "debug" output, so the build failed without an
error message in Hydra (https://hydra.nixos.org/build/210121811).
build-remote: don't warn when all local build slots are taken
We now support:

1. Multiple sockets, per the systemd socket activation spec

2. The sockets not having pid/uid/gid peer info because they might not
   be Unix domain sockets.

The changes are by @edolstra, taken from NixOS#5265. This is just that PR
*without* the TCP parts, which I gathered are the controversial parts.
Hopefully this remainder is not so controversial.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.