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 #3600 #5212

Merged
merged 2,782 commits into from
Sep 15, 2021
Merged

Conversation

mkenigs
Copy link
Contributor

@mkenigs mkenigs commented Sep 3, 2021

#4155 is now out of date as well

edolstra and others added 30 commits July 8, 2021 14:33
Fix the `name` attribute in builtins.fetchGit
Instead have get-env.sh dump the bash environment as JSON. This should
be a lot less error-prone.

Fixes NixOS#4992.
nix develop: Make bash environment parsing more robust
nix-repl> builtins.toString { outPath = "somestring"; }
"somestring"
'--delete-older-than 10' deletes the generations older than a single day, and '--delete-older-than 12m' deletes all generations older than 12 days.

This changes makes it throw on those invalid inputs, and gives an example of a valid input.
 Conflicts:
        src/nix/develop.cc
        src/nix/get-env.sh
        tests/shell.nix
toString also coerces a set with an outPath attribute to a string
Passing nscd socket into the build environment causes unexpected behavior in programs that make getpwuid and other related calls.

relevant threads:
- NixOS#4991
- https://discourse.nixos.org/t/haunted-nix-build-breaks-isolation/13869
fixed-output derivations: fix incorrect responses for getpwuid
Make `nix develop .#foo` search `.#devShells.${system}.foo` first
Add a `devShells` attribute to the flake schema
libexpr: Fix read out-of-bound on the heap
edolstra and others added 25 commits September 14, 2021 11:46
Change warning messages from yellow to magenta
git+ssh only works if you have SSH access.
Fix 'nix flake clone' on github repos
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 13 to 14.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](cachix/install-nix-action@v13...v14)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Remove the 'ca-references' feature check
…chix/install-nix-action-14

Bump cachix/install-nix-action from 13 to 14
For extensibility, every leaf node is now an object that contains at
least a type field (e.g. "type": "derivation").
With --no-write-lock-file, it's possible that flake.lock is out of
sync with the actual inputs used by the evaluation. So doing fromJSON
(readFile ./flake.lock) will give wrong results.

Fixes NixOS#4639.
Add missing 'nix profile' subcommands
This allows sandboxed x86_64-darwin builds on aarch64-darwin.
@mkenigs
Copy link
Contributor Author

mkenigs commented Sep 15, 2021

Think I fixed it, just needed {} instead of -1

@edolstra edolstra merged commit 79152e3 into NixOS:auto-uid-allocation Sep 15, 2021
@edolstra
Copy link
Member

Thanks, awesome!

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.