Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Nix
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

2c853e2a

Commit 2c853e2a authored 3 years ago by Eelco Dolstra

Downloads
- Plain Diff

Merge branch 'master' of github.com:NixOS/nix

parents 3b3e6bb1 e700ecb9

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 0 deletions

Makefile
doc/manual/generate-builtins.nix 6 additions, 4 deletions

doc/manual/generate-builtins.nix
doc/manual/local.mk 1 addition, 0 deletions

doc/manual/local.mk
doc/manual/src/expressions/builtins-prefix.md 5 additions, 4 deletions

doc/manual/src/expressions/builtins-prefix.md
doc/manual/src/expressions/builtins-suffix.md 1 addition, 0 deletions

doc/manual/src/expressions/builtins-suffix.md
misc/fish/completion.fish 37 additions, 0 deletions

misc/fish/completion.fish
misc/fish/local.mk 1 addition, 0 deletions

misc/fish/local.mk
scripts/install.in 1 addition, 1 deletion

scripts/install.in
src/libcmd/installables.cc 44 additions, 8 deletions

src/libcmd/installables.cc
src/libexpr/primops/fetchTree.cc 15 additions, 5 deletions

src/libexpr/primops/fetchTree.cc
src/libstore/machines.cc 11 additions, 6 deletions

src/libstore/machines.cc

with 123 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment