WIP: merge (mesonified) upstream master into windows-meson #1

tar(1) on FreeBSD does not use standard output or input when the -f flag is not provided. Instead, it defaults to /dev/sa0 on FreeBSD. Make this tar invocation a bit more robust and explicitly tell tar(1) to use standard output. This is one of the issues discovered while porting Nix to FreeBSD. It has been tested and committed locally to FreeBSD ports: https://svnweb.freebsd.org/ports/head/sysutils/nix/Makefile?revision=550026&view=markup#l108

Co-authored-by: Eelco Dolstra <[email protected]>

Fix tar invocation on FreeBSD

CA derivations that depend on other CA derivations

…chix/install-nix-action-v11 Bump cachix/install-nix-action from v10 to v11

Issue NixOS#4050.

This reverts commit 9ab07e9.

…protocol

Fixes NixOS#1560, NixOS#2377.

add more examples to --help of `nix run`

Fix profile update in nix command

…rotocol More templated STL support for the daemon protocol

…StoreFromDump Get rid of Hash::dummy from BinaryCacheStore

Fixes NixOS/infra#123.

"clang++" includes the string "g++" so this test didn't work properly. However the separate handling of clang might not be needed anymore...

This was useful for an experiment with building Nix as a single compilation unit. It's not very useful otherwise but also doesn't hurt...

Fix macOS sandbox build

Observed on Centos 7 when user namespaces are disabled: DerivationGoal::startBuilder() throws an exception, ~DerivationGoal() waits for the child process to exit, but the child process hangs forever in drainFD(userNamespaceSync.readSide.get()) in DerivationGoal::runChild(). Not sure why the SIGKILL doesn't get through. Issue NixOS#4092.

See comment for rational; I think it's good to leave a comment lest anyone is tempted to add such a sum-type instance again. Fixes NixOS#4113

…-proto Remove generic std::optional<T> suppport from worker proto

Fixes NixOS#4118.

If max_user_namespaces is set to 0, then don't run the build in a user namespace. Fixes NixOS#4092.

This makes builds work inside nixos-enter. Fixes NixOS#3145.

Support user namespaces being disabled

rust: small patches

Closes NixOS#4096.

Make nix output completions in the form `completion\tdescription`. This can't be used by bash (afaik), but other shells like zsh or fish can display it along the completion choices

@clhodapp

Based on @clhodapp's suggestion in nix-community/nix-zsh-completions#32 (comment) and adapted to use the description of the completions

Issue NixOS#4092.

This fixes a crash during startup when compiling Nix as a single compilation unit.

…-builds

Add a zsh completion script

Fixes NixOS#4104.

This is set to "localhost" by stdenv which is probably not what you want.

This matches the already-existing `local-fs-store.cc`.

… 'build-6', 'build-7' and 'build-8' into split_build_cc

…re-header Split out `local-fs-store.hh`

As a bonus, Worker::removeGoal is less inefficient.

This prepares for the splitting that happens in the next commit.

…tore Split out uds-remote-store.{cc.hh}

Fixes bogus messages like "currently hard linking saves 17592186044416.00 MiB".

…h-2', 'split_build_hh-3' and 'split_build_hh-4' into split_build_cc

…l-maps

Handle amount of disk space saved by hard linking being negative

Fixes build failures like # nix log /nix/store/gjaa0psfcmqvw7ivggsncx9w364p3s8s-sshd.conf-validated.drv No user exists for uid 30012

…-builds

And remove one that we didn't actually need to add

Per the comments, the underlying issue is libarchive/libarchive#1446, knowing this allows the hack to be much more targetted.

…static-builds

Bump Nixpkgs to hopefully fix linkrot

…nsystems/nix into master

Perl-based tests are deprecated since NixOS 20.03 and subsequently got removed in NixOS 20.09, which effectively means that tests are going to fail as soon as we build it with NixOS 20.09 or anything newer. I've put "# fmt: off" at the start of every testScript, because formatting with Black really messes up indentation and I don't think it really adds anything in value or readability for inlined Python scripts. Signed-off-by: aszlig <[email protected]>

Having vm-test-run-unnamed for all the test derivation doesn't look very nice, so in order to better distinguish them from their store path, let's actually give them proper names. Signed-off-by: aszlig <[email protected]>

Convert VM tests to Python

…n-loop Fix substitution loop NixOS#3964, NixOS#3534

doc: nix-shell in pure mode does *not* source user bashrc

Properly type the derivation and substitution goal maps

Flake input changes: * Updated 'nixpkgs': 'github:NixOS/nixpkgs/3a10a004bb5802d5f23c58886722e4239705e733' -> 'github:NixOS/nixpkgs/ad0d20345219790533ebe06571f82ed6b034db31'

checks should be relatively fast, but buildStatic depends on a lot of stuff that isn't in the binary cache (e.g. musl builds of Git and Mercurial that we probably don't need since we don't link against them...).

Switch to Nixpkgs 20.09

Add some internal documentation for flake support objects.

Keeping this commit narrow for reviewability, but some of these conditionals will change in subsequent commits in this PR. Fixes NixOS#3852.

- xpath -> xmllint: xpath's cli interface changed in Big Sur rather than add conditional logic for picking the correct syntax for xpath, I'm changing to xmllint --xpath, which appears to be consistent across versions I've tested... - /plist/dict/key[text()='Writable']/following-sibling::true[1] doesn't do quite what's expected. It was written to try to select a <true /> node paired with the Writable key, but it will also select the *next* <true /> node that appears even if it was paired with another key. - I think there's also a logic bug in the conditionals here. I'm not sure anyone ever actuall saw it, thanks to the xpath bug, though. With the xpath fix, this conditional passes if /nix does not exist, / IS writable, and the version is Catalina+. I think it meant to test for /nix does not exist, / is NOT writable, and the version is Catalina+. I reworked this lightly to make it a little clearer at the code level.

As mentioned in previous commit, Big Sur changes the syntax for the xpath command slightly. In the process of testing out replacements for these, I noticed a few small simplification wins.

Fixes NixOS#3957. Just runs both forms to minimize moving parts.

The move from release.nix to flake.nix appears to have lost some changes from NixOS#3628 / 1c56f18, leaving create-darwin-volume.sh out of the release tarball. Under the assumption that this was just an accident/byproduct of when flake.nix split off and not intentional, I am restoring those edits.

Some of the changes in NixOS#3788 to support non-systemd Nix installs don't appear to be aware that the darwin installer exists, which resulted in some skipped steps and inappropriate instructions.

Env vars for ZSH were moved from /etc/zshrc to /etc/zshenv in NixOS#3608 to address an issue with zshrc getting clobbered by OS updates, but /etc/zshenv doesn't exist by default--so *nothing* would get set up for zsh users unless they already happened to have /etc/zshenv. Creating these files if they don't exist. Also cut separate creation of profile.d/nix.sh, which isn't needed now.

Macos big sur installer fixes

Fix NixOS#3975: Currently if Ctrl-C is pressed during a phase, the interactive subshell is not exited. Removing --rcfile when --phase is present makes bash non-interactive

Make bash non-interactive for nix develop --phase

This was probably revived in a bad merge.

Add NIX_CONFIG env var for applying nix.conf overrides

This was accidentally documented as NIX_OPTIONS.

Fixes 'nix develop nixpkgs#qpdfview'.

Fix the docs about the new NIX_CONFIG env var

This is primarily useful if you're hacking simultaneously on a package and one of its dependencies. E.g. if you're hacking on Hydra and Nix, you would start a dev shell for Nix, and then a dev shell for Hydra as follows: $ nix develop \ --redirect .#hydraJobs.build.x86_64-linux.nix ~/Dev/nix/outputs/out \ --redirect .#hydraJobs.build.x86_64-linux.nix.dev ~/Dev/nix/outputs/dev (This assumes hydraJobs.build.x86_64-linux has a passthru.nix attribute. You can also use a store path.) This causes all references in the environment to those store paths to be rewritten to ~/Dev/nix/outputs/{out,dev}. Note: unfortunately, you may need to set LD_LIBRARY_PATH=~/Dev/nix/outputs/out/lib because Nixpkgs' ld-wrapper only adds -rpath entries for -L flags that point to the Nix store.

nix develop: Add --redirect flag to redirect dependencies

This reverts commit 189e6f5. After some discussion, it seems better not to bump the major version number since most of the new features since 2.3 are marked experimental.

See NixOS#4056 (comment)

Although the non-resolved derivation will never get a cache-hit (it doesn't have an output path to query the cache for anyways), we might get one on the resolved derivation.

Allow non-CA derivations to depend on CA ones

The mercurial windows support will just have to be redone, I'm afraid. It's changed too much with the introduction of libfetchers.

…indows-meson-merge-master

…dows-meson-merge-master

…on-merge-master

Fixes NixOS#4175

No x86_32 static nix jobs for now

This makes it even clearer which of the two hashes was specified in the nix files. Some may think that "wanted" and "got" is obvious, but: "got" could mean "got in nix file" and "wanted" could mean "want to see in nix file".

Lowdown is a portability mess; we'll just skip for now.

No glob.h

Capitalize JSON for consistency

Alter "wanted:" to "specified:" in hash mismatch output

This removes the extra-substituters and extra-sandbox-paths settings and instead makes every array setting extensible by setting "extra-<name> = <value>" in the configuration file or passing "--<name> <value>" on the command line.

Use "run" to avoid confusion with Nix evaluation. "evaluated" was intended to reference bash eval but it's ambiguous.

Nix shell doc

Crucially this introduces BoehmGCStackAllocator, but it also adds a bunch of wiring to avoid making libutil depend on bdw-gc. Part of the solutions for NixOS#4178, NixOS#4200

The default stack size was not based on the normal stack size and was too small.

It was accidentally removed in commit ca30abb

…ddToStoreFromDump Restore RestrictedStore.addToStoreFromDump implementation

…Source-deadlock Fix RemoteStore pool deadlock in filterSource etc

Everywhere else a $ is used

readDerivation() requires a valid path. Fixes NixOS#4210.

Creates test coverage for NixOS#4210 and 7cf874c

nix-copy-closure: verify it works with drvs

…dows-meson-merge-master

…-merge-master

Fix memory corruption caused by GC-invisible coroutine stacks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WIP: merge (mesonified) upstream master into windows-meson #1

WIP: merge (mesonified) upstream master into windows-meson #1

Commits on Sep 28, 2020

Commits on Sep 29, 2020

Commits on Sep 30, 2020

Commits on Oct 1, 2020

Commits on Oct 2, 2020

Commits on Oct 5, 2020

Commits on Oct 6, 2020

Commits on Oct 7, 2020

Commits on Oct 8, 2020

Commits on Oct 9, 2020

Commits on Oct 11, 2020

Commits on Oct 12, 2020

Commits on Oct 13, 2020

Commits on Oct 14, 2020

Commits on Oct 15, 2020

Commits on Oct 16, 2020

Commits on Oct 17, 2020

Commits on Oct 18, 2020

Commits on Oct 19, 2020

Commits on Oct 20, 2020

Commits on Oct 21, 2020

Commits on Oct 22, 2020

Commits on Oct 23, 2020

Commits on Oct 25, 2020

Commits on Oct 26, 2020

Commits on Oct 27, 2020

Commits on Oct 28, 2020

Commits on Oct 29, 2020

Commits on Oct 30, 2020

Commits on Oct 31, 2020

Commits on Nov 2, 2020

Commits on Nov 3, 2020

Commits on Nov 5, 2020

WIP: merge (mesonified) upstream master into windows-meson #1

Are you sure you want to change the base?

WIP: merge (mesonified) upstream master into windows-meson #1

Commits on Sep 28, 2020

Commits on Sep 29, 2020

Commits on Sep 30, 2020

Commits on Oct 1, 2020

Commits on Oct 2, 2020

Commits on Oct 5, 2020

Commits on Oct 6, 2020

Commits on Oct 7, 2020

Commits on Oct 8, 2020

Commits on Oct 9, 2020

Commits on Oct 11, 2020

Commits on Oct 12, 2020

Commits on Oct 13, 2020

Commits on Oct 14, 2020

Commits on Oct 15, 2020

Commits on Oct 16, 2020

Commits on Oct 17, 2020

Commits on Oct 18, 2020

Commits on Oct 19, 2020

Commits on Oct 20, 2020

Commits on Oct 21, 2020

Commits on Oct 22, 2020

Commits on Oct 23, 2020

Commits on Oct 25, 2020

Commits on Oct 26, 2020

Commits on Oct 27, 2020

Commits on Oct 28, 2020

Commits on Oct 29, 2020

Commits on Oct 30, 2020

Commits on Oct 31, 2020

Commits on Nov 2, 2020

Commits on Nov 3, 2020

Commits on Nov 5, 2020