aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-17Merge pull request #5573 from Ericson2314/docker-nixpkgs-idiomsEelco Dolstra
Make docker.nix match Nixpkgs's idioms
2021-11-16Merge pull request #5578 from edolstra/call-functorEelco Dolstra
Call functors with both arguments at once
2021-11-16Call functors with both arguments at onceEelco Dolstra
This is not really useful on its own, but it does recover the 'infinite recursion' error message for '{ __functor = x: x; } 1', and is more efficient in conjunction with #3718. Fixes #5515.
2021-11-16Merge pull request #5575 from edolstra/attrset-callEelco Dolstra
Don't hang when calling an attrset
2021-11-16Don't hang when calling an attrsetEelco Dolstra
Fixes #5565.
2021-11-16Make docker.nix match Nixpkgs's idiomsJohn Ericson
1. `target` is the wrong name, that is just for compilers per out standard terminology. We just need to worry about "build" and "host". 2. We only need one `pkgs`. `pkgs.buildPackages` is how we get anything we need at build time. 3. `crossSystem` is the name of a nixpkgs parameter that is actually an attribute set, not a 2-part "cpu-os" string. 3. `pkgsCross` effectively evaluates Nixpkgs twice, which is inefficient. It is just there for people poking around the CLI / REPL (and I am skeptical even that is a good idea), and *not* what written code should use, especially code that is merely parametric in the package set it is given. 4. We don't need to memoize Nixpkgs here because we are only doing one pkg set at a time (no `genAttrs`) so it's better to just delete all this stuff. `flake.nix` instead would do something like that, with `genAttrs` (though without `pkgsCross`), if and when we have hydra jobs for cross builds.
2021-11-16Ignore errors unsharing/restoring the mount namespaceEelco Dolstra
This prevents Nix from barfing when run in a container where it doesn't have the appropriate privileges.
2021-11-16Merge branch 'add-docker-image-to-hydra-jobs' of https://github.com/garbas/nixEelco Dolstra
2021-11-16Merge pull request #5452 from Kha/git-extend-lockEelco Dolstra
git: extend cache dir lock over all mutating operations
2021-11-16Merge pull request #5472 from NixOS/async-realisation-substitutionEelco Dolstra
async realisation substitution
2021-11-16Merge pull request #5559 from Kloenk/libfetchers-gitlab-headersEelco Dolstra
libfetchers: set free gitlab headers
2021-11-15Merge branch 'master' of github.com:NixOS/nixEelco Dolstra
2021-11-15Simplify lockFlake() a bitEelco Dolstra
2021-11-15Merge branch 'balsoft/fix-subinputs-not-getting-updated' of ↵Eelco Dolstra
https://github.com/tweag/nix
2021-11-15Merge pull request #5394 from NixOS/backportDomen Kožar
Add backport action
2021-11-15Add backport actionDomen Kožar
2021-11-15Merge pull request #5428 from kreisys/add-pos-to-json-type-errorDomen Kožar
toJSON: report error position for fancier output
2021-11-15Merge pull request #5553 from kamadorueda/issue-3505Eelco Dolstra
toXML: display errors position
2021-11-15Merge pull request #5555 from kamadorueda/typosEelco Dolstra
fix many doc typos
2021-11-14libfetchers: set free gitlab headersFinn Behrens
2021-11-13fix many doc typosKevin Amado
2021-11-13toXML: display errors positionKevin Amado
- This change applies to builtins.toXML and inner workings - Proof of concept: ```nix let e = builtins.toXML e; in e ``` - Before: ``` $ nix-instantiate --eval poc.nix error: infinite recursion encountered ``` - After: ``` $ nix-instantiate --eval poc.nix error: infinite recursion encountered at /data/github/kamadorueda/nix/poc.nix:1:9: 1| let e = builtins.toXML e; in e | ```
2021-11-12TypoEelco Dolstra
2021-11-12Merge pull request #5533 from abathur/improve_existing_backup_profile_msg_2Eelco Dolstra
installer: make rc replacement instructions explicit
2021-11-12Merge pull request #5540 from samueldr/fix/key-subcommandEelco Dolstra
nix key: Fix error message and don't require flakes
2021-11-12Merge pull request #5542 from samueldr/fix/registry-experimentalEelco Dolstra
nix registry: Mark experimental
2021-11-12nix registry: Mark experimentalSamuel Dionne-Riel
This is part of the flakes feature. Mark it as such.
2021-11-11nix key: Fix error message and don't require flakesSamuel Dionne-Riel
2021-11-11Documenting how to use/build Nix' Docker imageRok Garbas
2021-11-11docker.nix: Use 'with'Eelco Dolstra
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-11Docker image with Nix insideRok Garbas
2021-11-11Flakes: refetch the input when a follows disappearsAlexander Bantyev
When an input follows disappears, we can't just reuse the old lock file entries since we may be missing some required ones. Refetch the input when this happens. Closes https://github.com/NixOS/nix/issues/5289
2021-11-10installer: make rc replacement instructions explicitTravis A. Everett
2021-11-10Merge pull request #5524 from abathur/improve_existing_backup_profile_msgEelco Dolstra
installer: improve existing rc backup nag
2021-11-10Merge pull request #5528 from matthewbauer/recognize-nixosModuleEelco Dolstra
Recognize singular "nixosModule" in nix flake show
2021-11-09Recognize singular "nixosModule" in nix flake showMatthew Bauer
This makes nixosModule appears as a "NixOS Module" like nixosModules does.
2021-11-09Merge pull request #5494 from tweag/balsoft/allow-references-in-addPathEelco Dolstra
Allow references in addPath
2021-11-09installer: improve existing rc backup nagTravis A. Everett
2021-11-09Merge pull request #5519 from edolstra/move-unshareEelco Dolstra
Unshare mount namespace in main()
2021-11-09addToStore, addToStoreFromDump: refactor: pass refs by const referenceAlexander Bantyev
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
2021-11-09Merge pull request #5520 from ↵Eelco Dolstra
NixOS/dependabot/github_actions/actions/checkout-2.4.0 Bump actions/checkout from 2.3.5 to 2.4.0
2021-11-08Bump actions/checkout from 2.3.5 to 2.4.0dependabot[bot]
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08Unshare mount namespace in main()Eelco Dolstra
Doing it as a side-effect of calling LocalStore::makeStoreWritable() is very ugly. Also, make sure that stopping the progress bar joins the update thread, otherwise that thread should be unshared as well.
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