aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-09Recognize singular "nixosModule" in nix flake showMatthew Bauer
This makes nixosModule appears as a "NixOS Module" like nixosModules does.
2021-11-08Merge branch 'fix-writable-shell' of https://github.com/yorickvP/nixEelco Dolstra
2021-11-08Merge pull request #5434 from timothyklim/git-url-submodulesEelco Dolstra
Support building flakes from a Git repo url with submodules
2021-11-08Merge pull request #5500 from abathur/fix_darwin_existing_mounted_volumeEelco Dolstra
darwin-install: fix already-mounted store volumes
2021-11-08Merge pull request #5504 from NixOS/flake-options-and-daemonEelco Dolstra
Make the flake options work when using the daemon
2021-11-08Merge pull request #5506 from NixOS/fix-post-hook-test-with-different-daemonEelco Dolstra
Make the post-build-hook use the daemon Nix package
2021-11-08Merge pull request #5517 from Zimmi48/fix-cli-guideline-typoEelco Dolstra
Fix some typos in CLI guideline.
2021-11-08Merge pull request #5514 from andir/let-body-unusedEelco Dolstra
Remove unused "<let-body>" symbol
2021-11-08Fix some typos in CLI guideline.Théo Zimmermann
2021-11-07Remove unused "<let-body>" symbolAndreas Rammhold
The requirement for the symbol has been removed since at least 7d47498.
2021-11-05Merge pull request #5476 from NixOS/ca/fix-build-in-nix-replThéophane Hufschmitt
Fix `nix repl`’s building of CA derivations
2021-11-05Make the flake options work when using the daemonregnat
When setting flake-local options (with the `nixConfig` field), forward these options to the daemon in case we’re using one. This is necessary in particular for options like `binary-caches` or `post-build-hook` to make sense. Fix <https://github.com/NixOS/nix/commit/343239fc8a1993f707a990c2cd54a41f1fa3de99#r44356843>
2021-11-05Merge pull request #5501 from edolstra/optimize-callsEelco Dolstra
Optimize primop calls
2021-11-05Make the post-build-hook use the daemon Nix packageregnat
Having the `post-build-hook` use `nix` from the client package can lead to a deadlock in case there’s a db migration to do between both, as a `nix` command running inside the hook will run as root (and as such will bypass the daemon), so might trigger a db migration, which will get stuck trying to get a global lock on the DB (as the daemon that ran the hook already has a lock on it).
2021-11-05Fix `nix repl`’s building of CA derivationsregnat
When running a `:b` command in the repl, after building the derivations query the store for its outputs rather than just assuming that they are known in the derivation itself (which isn’t true for CA derivations) Fix #5328
2021-11-04Merge pull request #5493 from jtojnar/patch-1Eelco Dolstra
docs: Correct fallback user config path
2021-11-04darwin-install: fix already-mounted store volumesTravis A. Everett
This adds an explicit unmount of the store volume to avoid cases where the installer can hang in await_volume when: - the user already has a store volume - that volume is already mounted somewhere other than /nix - they do not take a path through the installer that results in an explicit unmount (as both removing and encrypting the volume would do)
2021-11-04Remove maxPrimOpArityEelco Dolstra
2021-11-04Fix function-trace test caseEelco Dolstra
2021-11-04Fix derivation primopEelco Dolstra
2021-11-04Use callFunction() with an array for some calls with arity > 1Eelco Dolstra
2021-11-04Add level / displacement typesEelco Dolstra
2021-11-04Optimize primop callsEelco Dolstra
We now parse function applications as a vector of arguments rather than as a chain of binary applications, e.g. 'substring 1 2 "foo"' is parsed as ExprCall { .fun = <substring>, .args = [ <1>, <2>, <"foo"> ] } rather than ExprApp (ExprApp (ExprApp <substring> <1>) <2>) <"foo"> This allows primops to be called immediately (if enough arguments are supplied) without having to allocate intermediate tPrimOpApp values. On $ nix-instantiate --dry-run '<nixpkgs/nixos/release-combined.nix>' -A nixos.tests.simple.x86_64-linux this gives a substantial performance improvement: user CPU time: median = 0.9209 mean = 0.9218 stddev = 0.0073 min = 0.9086 max = 0.9340 [rejected, p=0.00000, Δ=-0.21433±0.00677] elapsed time: median = 1.0585 mean = 1.0584 stddev = 0.0024 min = 1.0523 max = 1.0623 [rejected, p=0.00000, Δ=-0.20594±0.00236] because it reduces the number of tPrimOpApp allocations from 551990 to 42534 (i.e. only small minority of primop calls are partially applied) which in turn reduces time spent in the garbage collector.
2021-11-04StaticEnv: Use std::vector instead of std::mapEelco Dolstra
2021-11-04Add helper function to check whether a function arg is 'X' or '_X'Eelco Dolstra
Also allow '_'.
2021-11-04docs: Correct fallback user config pathJan Tojnar
This is in line with XDG Base Directory Specification, where ~/.config is supposed to be used when XDG_CONFIG_HOME is unset. It also better matches the reality, where ~/.config/nix.conf does not seem to be used.
2021-11-04Merge pull request #5486 from mohe2015/bugfixes2Eelco Dolstra
Fix leaking pthread_attr_t
2021-11-04Merge pull request #5488 from JanCVanB/patch-1Eelco Dolstra
Reword "we"s to "I"s for consistency
2021-11-03Reword "we"s to "I"s for consistencyJan Van Bruggen
This script uses multiple forms of the first-person POV: 1. "We" to refer to the Nix team (https://github.com/NixOS/nix/blob/1e7c796e66a692cd097b155bd0a60fedf20d554f/scripts/install-multi-user.sh#L72) 2. "We" to refer to the combination of the installation script & the user/executor (https://github.com/NixOS/nix/blob/1e7c796e66a692cd097b155bd0a60fedf20d554f/scripts/install-multi-user.sh#L710) 3. "We" to refer to the installation script alone (https://github.com/NixOS/nix/blob/1e7c796e66a692cd097b155bd0a60fedf20d554f/scripts/install-multi-user.sh#L602) 4. "I" to refer to the installation script alone (https://github.com/NixOS/nix/blob/1e7c796e66a692cd097b155bd0a60fedf20d554f/scripts/install-multi-user.sh#L200) Since I prefer POV 4 to POV 3, this changes all instances of POV 3 to POV 4.
2021-11-03Fix leaking pthread_attr_tMoritz Hedtke
pthread_attr_destroy was not called.
2021-11-03Merge pull request #5475 from doronbehar/SQLiteWAL-vfsEelco Dolstra
libstore: Use unix-dotfile vfs if useSQLiteWAL is false
2021-11-03Merge pull request #5477 from league/check-overlay-argsEelco Dolstra
In checkOverlay, accept underscored names for final/prev args.
2021-11-03Merge pull request #5480 from rex4539/typosDomen Kožar
Fix typos
2021-11-03Fix typosDimitris Apostolou
2021-11-03In checkOverlay, accept underscored names for final/prev args.Christopher League
Resolves #4416.
2021-11-03libstore: Use unix-dotfile vfs if useSQLiteWAL is falseDoron Behar
2021-11-03Merge pull request #5471 from simon04/patch-1Eelco Dolstra
command-ref/nix-shell: fix --pure, --keep
2021-11-02command-ref/nix-shell: fix --pure, --keepSimon Legner
2021-11-02Merge pull request #5459 from andersk/echo-eEelco Dolstra
installer: Do not use echo -e in #!/bin/sh script
2021-11-02installer: Do not use echo -e in #!/bin/sh scriptAnders Kaseorg
ShellCheck correctly warns: In scripts/install-nix-from-closure.sh line 218: echo -e "\nif [ -e $p ]; then . $p; fi # added by Nix installer" >> "$fn" ^-- SC3037: In POSIX sh, echo flags are undefined. In scripts/install-nix-from-closure.sh line 229: echo -e "\nif [ -e $p ]; then . $p; fi # added by Nix installer" >> "$fn" ^-- SC3037: In POSIX sh, echo flags are undefined. Indeed, this actually breaks on Ubuntu where /bin/sh is dash. Fixes #5458. Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2021-11-02Merge pull request #5462 from edolstra/remove-source-tarballEelco Dolstra
Remove references to building from the source tarball
2021-11-02Remove references to building from the source tarballEelco Dolstra
2021-11-02install-nix-actionv@v14.1Domen Kožar
2021-11-02Update release scriptEelco Dolstra
2021-11-01Fix 2.4 migration examplesEelco Dolstra
2021-10-29Merge pull request #5448 from edolstra/timeoutEelco Dolstra
Apply a 60-minute timeout to the 'tests' workflow
2021-10-29Apply a 60-minute timeout to the 'tests' workflowEelco Dolstra
2021-10-29StyleEelco Dolstra
2021-10-29Merge branch 'master' of https://github.com/alekswn/nixEelco Dolstra
2021-10-28Merge pull request #5149 from edolstra/non-blocking-gcEelco Dolstra
Non-blocking garbage collector